sysbuild: add flash_sim overlay for s1 image

This patch fixes the sysbuild build for thingy91x nrf5340. Previously, the flash_sim overlay was not included in the s1 image. Signed-off-by: Maximilian Deubel <[email protected]>
nrfconnect · May 29, 2024 · 36c8145 · 36c8145
1 parent 93cf90e
commit 36c8145
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/boards/nordic/thingy91x/Kconfig.sysbuild b/boards/nordic/thingy91x/Kconfig.sysbuild
@@ -13,6 +13,9 @@ if BOARD_THINGY91X_NRF5340_CPUAPP || BOARD_THINGY91X_NRF5340_CPUAPP_NS
 config SECURE_BOOT_NETCORE
 	default y
 
+config SECURE_BOOT_APPCORE
+	default y
+
 config NETCORE_APP_UPDATE
 	default y
 

diff --git a/sysbuild/CMakeLists.txt b/sysbuild/CMakeLists.txt
@@ -339,6 +339,12 @@ function(${SYSBUILD_CURRENT_MODULE_NAME}_pre_cmake)
           mcuboot
           ${ZEPHYR_NRF_MODULE_DIR}/modules/mcuboot/flash_sim.overlay
           )
+        if(SB_CONFIG_SECURE_BOOT_BUILD_S1_VARIANT_IMAGE)
+          add_overlay_dts(
+            s1_image
+            ${ZEPHYR_NRF_MODULE_DIR}/modules/mcuboot/flash_sim.overlay
+            )
+        endif()
       else()
         set_config_bool(mcuboot CONFIG_PCD_APP n)
       endif()