patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

sysbuild: Apply FILE_SUFFIX to sysbuild.conf

Browse source 
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: Grzegorz Swiderski <grzegorz.swiderski@nordicsemi.no>
This commit is contained in:
Grzegorz Swiderski 2024-03-13 11:17:35 +01:00 committed by Fabio Baltieri
parent 073240fa68
commit 7b2c947ac8
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
share/sysbuild/cmake/modules/sysbuild_kconfig.cmake
View file

@ -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)