From 632fa1ff4db9afbc94957bda42255712a219537d Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 9 Dec 2024 12:21:37 +0000 Subject: [PATCH 1/2] sysbuild: Prevent some configuration options with single image mode Prevents making some options configurable and sets correct limits when MCUboot is configured in single application mode Signed-off-by: Jamie McCrae --- sysbuild/Kconfig.mcuboot | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sysbuild/Kconfig.mcuboot b/sysbuild/Kconfig.mcuboot index b72c2043b69d..3a68ef14ac95 100644 --- a/sysbuild/Kconfig.mcuboot +++ b/sysbuild/Kconfig.mcuboot @@ -55,6 +55,7 @@ config MCUBOOT_COMPRESSED_IMAGE_SUPPORT config MCUBOOT_MAX_UPDATEABLE_IMAGES int + default 1 if MCUBOOT_MODE_SINGLE_APP default 4 config MCUBOOT_APPLICATION_IMAGE_NUMBER @@ -63,7 +64,7 @@ config MCUBOOT_APPLICATION_IMAGE_NUMBER config MCUBOOT_NETWORK_CORE_IMAGE_NUMBER int - default 1 if NETCORE_APP_UPDATE + default 1 if NETCORE_APP_UPDATE && !MCUBOOT_MODE_SINGLE_APP default -1 config MCUBOOT_WIFI_PATCHES_IMAGE_NUMBER @@ -177,6 +178,7 @@ config MCUBOOT_USE_ALL_AVAILABLE_RAM config MCUBOOT_NRF53_MULTI_IMAGE_UPDATE bool "Network core multi-image update (in single operation)" depends on NETCORE_APP_UPDATE + depends on !MCUBOOT_MODE_SINGLE_APP help If selected, network core image updates can be applied in a single operation. This is required if the secondary partition resides in off-chip memory. From 9a4763b8ead873ea0c98e9447dc9038cd9e2cee7 Mon Sep 17 00:00:00 2001 From: Jamie McCrae Date: Mon, 9 Dec 2024 12:29:57 +0000 Subject: [PATCH 2/2] manifest: Update sdk-mcuboot Updates MCUboot to include override for selecting direct image upload Kconfig for nRF5340 to support network core updates in single slot serial recovery mode Signed-off-by: Jamie McCrae --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index bf65ed0c16ad..0468321e0319 100644 --- a/west.yml +++ b/west.yml @@ -130,7 +130,7 @@ manifest: compare-by-default: true - name: mcuboot repo-path: sdk-mcuboot - revision: v2.1.0-ncs3-rc1 + revision: b82206c15fff357c151c24bf97c99c4348d14a46 path: bootloader/mcuboot - name: qcbor url: https://github.com/laurencelundblade/QCBOR