Commit 7b2c947a authored by Grzegorz Swiderski's avatar Grzegorz Swiderski Committed by Fabio Baltieri
Browse files

sysbuild: Apply FILE_SUFFIX to sysbuild.conf 

Unless `SB_CONF_FILE` is set by the user, an optional `sysbuild.conf`
file is taken by default. If `FILE_SUFFIX=foo` is set, then it should
also be possible to find `sysbuild_foo.conf`, just like with `prj.conf`.

Signed-off-by: default avatarGrzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
parent 073240fa

share/sysbuild/cmake/modules/sysbuild_kconfig.cmake

+2 −4
Changes for share/sysbuild/cmake/modules/sysbuild_kconfig.cmake: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -17,11 +17,9 @@ if(DEFINED SB_CONF_FILE) 
  # SB_CONF_FILE already set so nothing to do.

elseif(DEFINED ENV{SB_CONF_FILE})

  set(SB_CONF_FILE $ENV{SB_CONF_FILE})

elseif(EXISTS      ${APP_DIR}/sysbuild.conf)

  set(SB_CONF_FILE ${APP_DIR}/sysbuild.conf)

else()

  # Because SYSBuild is opt-in feature, then it is permitted to not have a

  # SYSBuild dedicated configuration file.

  # sysbuild.conf is an optional file, because sysbuild is an opt-in feature.

  zephyr_file(CONF_FILES ${APP_DIR} KCONF SB_CONF_FILE NAMES "sysbuild.conf" SUFFIX ${FILE_SUFFIX})

endif()



if(NOT DEFINED SB_EXTRA_CONF_FILE AND DEFINED SB_OVERLAY_CONFIG)

CRA Git | Maintained and supported by SUSTech CRA and CCSE