Move MCUboot configuration from boards to generic sysbuild folder

This allows to build the BMS C1 board with and without sysbuild.
LibreSolar · Oct 8, 2024 · c556a8f · c556a8f
1 parent 4255759
commit c556a8f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/app/boards/bms_c1.conf b/app/boards/bms_c1.conf
@@ -38,19 +38,3 @@ CONFIG_SHELL_CMDS_SELECT=y
 CONFIG_THINGSET_SHELL=y
 CONFIG_THINGSET_SHELL_REPORTING=n
 CONFIG_THINGSET_SHELL_CMD_BUF_SIZE=256
-
-# DFU over CAN
-CONFIG_THINGSET_DFU=y
-
-# Flash driver to store firmware image
-CONFIG_FLASH=y
-CONFIG_FLASH_MAP=y
-CONFIG_FLASH_PAGE_LAYOUT=y
-CONFIG_STREAM_FLASH=y
-CONFIG_IMG_MANAGER=y
-# progressive erase is required for this MCU, otherwise erasing the large SPI flash takes too long
-CONFIG_IMG_ERASE_PROGRESSIVELY=y
-
-# Application-side MCUboot configuration
-CONFIG_BOOTLOADER_MCUBOOT=y
-CONFIG_MCUBOOT_GENERATE_UNSIGNED_IMAGE=n
diff --git a/app/sysbuild.conf b/app/sysbuild.conf
@@ -0,0 +1,4 @@
+# Sysbuild configuration file
+
+# Use MCUboot as bootloader
+SB_CONFIG_BOOTLOADER_MCUBOOT=y
diff --git a/app/sysbuild/app.conf b/app/sysbuild/app.conf
@@ -0,0 +1,12 @@
+# Extra configuration for app when using sysbild
+
+# DFU over ThingSet (e.g. CAN)
+CONFIG_THINGSET_DFU=y
+
+# Flash driver to store firmware image
+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+CONFIG_STREAM_FLASH=y
+CONFIG_IMG_MANAGER=y
+CONFIG_IMG_ERASE_PROGRESSIVELY=y