Skip to content

Commit 0797c1b

Browse files
MarekPietarlubos
authored andcommitted
sysbuild: CMakeLists.txt: Fix enabling B0 in sysbuild
Enabling B0 must not override firmware version set by application configuration. Since the file is now used also without MCUboot, it was renamed to show intention. Signed-off-by: Marek Pieta <Marek.Pieta@nordicsemi.no>
1 parent 30ba749 commit 0797c1b

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

sysbuild/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
316316
if(SB_CONFIG_BOOTLOADER_MCUBOOT)
317317
add_overlay_config(
318318
mcuboot
319-
${ZEPHYR_NRF_MODULE_DIR}/sysbuild/mcuboot_enable_secure_bootloader.overlay
319+
${ZEPHYR_NRF_MODULE_DIR}/sysbuild/enable_secure_bootloader.conf
320320
)
321321

322322
add_overlay_config(
@@ -326,7 +326,7 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
326326
else()
327327
add_overlay_config(
328328
${DEFAULT_IMAGE}
329-
${ZEPHYR_NRF_MODULE_DIR}/sysbuild/mcuboot_enable_secure_bootloader.overlay
329+
${ZEPHYR_NRF_MODULE_DIR}/sysbuild/enable_secure_bootloader.conf
330330
)
331331
endif()
332332
endif()

sysbuild/mcuboot_enable_secure_bootloader.overlay renamed to sysbuild/enable_secure_bootloader.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33

44
CONFIG_SECURE_BOOT=y
55
CONFIG_FW_INFO=y
6-
CONFIG_FW_INFO_FIRMWARE_VERSION=1

0 commit comments

Comments
 (0)