Build MCUboot using sysbuild

leonrinkel · Oct 16, 2023 · b5af9df · b5af9df
1 parent d8fca30
commit b5af9df
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 28 deletions.
diff --git a/BOOTLOADER.md b/BOOTLOADER.md
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ west update
 ## Building
 
 ```sh
-west build -b sam_fd sam-fd-sdk/app
+west build --sysbuild -b sam_fd sam-fd-sdk/app
 ```
 
 ## Flashing
@@ -28,13 +28,13 @@ west flash --runner pyocd
 
 ### Via Serial Recovery
 
-Serial recovery mode can be entered by running a command like the following immediately after resetting. This requires a MCUboot bootloader. Please see [BOOTLOADER.md](BOOTLOADER.md) for instructions on building one.
+Serial recovery mode can be entered by running a command like the following immediately after resetting.
 
 ```sh
 mcumgr \
     --conntype serial \
     --connstring dev=/dev/cu.usbserial-110,baud=115200 \
-    image upload -e build/zephyr/zephyr.signed.bin
+    image upload -e build/app/zephyr/zephyr.signed.bin
 ```
 
 ## License

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -9,4 +9,9 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(app LANGUAGES C)
 
+# Verify that this samnple is built through sysbuild to ensure MCUboot is
+# automatically included and that sample specific MCUboot configurations are
+# used when building MCUboot.
+test_sysbuild()
+
 target_sources(app PRIVATE src/main.c)
diff --git a/app/sample.yaml b/app/sample.yaml
@@ -5,6 +5,7 @@ sample:
   description: Example application
   name: example-application
 common:
+  sysbuild: true
   build_only: true
   integration_platforms:
     - sam_fd

diff --git a/app/sysbuild.conf b/app/sysbuild.conf
@@ -0,0 +1,2 @@
+SB_CONFIG_BOOTLOADER_MCUBOOT=y
+SB_CONFIG_BOOT_SIGNATURE_TYPE_NONE=y
diff --git a/app/sysbuild/mcuboot.conf b/app/sysbuild/mcuboot.conf
@@ -0,0 +1,10 @@
+CONFIG_SINGLE_APPLICATION_SLOT=y
+CONFIG_BOOT_SIGNATURE_TYPE_NONE=y
+CONFIG_BOOT_VALIDATE_SLOT0=n
+CONFIG_MAIN_STACK_SIZE=1024
+CONFIG_MCUBOOT_SERIAL=y
+CONFIG_CONSOLE=n
+CONFIG_UART_CONSOLE=n
+CONFIG_BOOT_SERIAL_WAIT_FOR_DFU=y
+CONFIG_BOOT_SERIAL_WAIT_FOR_DFU_TIMEOUT=500
+CONFIG_BOOT_ERASE_PROGRESSIVELY=y
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		SB_CONFIG_BOOTLOADER_MCUBOOT=y
		SB_CONFIG_BOOT_SIGNATURE_TYPE_NONE=y