From 4d71450700ab9fda75df62c7e0290f9e9da073f9 Mon Sep 17 00:00:00 2001 From: Dominik Ermel Date: Fri, 11 Aug 2023 12:53:22 +0000 Subject: [PATCH 1/2] flash_map/pm: Add definitions for third image Third image partition names. Signed-off-by: Dominik Ermel --- include/flash_map_pm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/flash_map_pm.h b/include/flash_map_pm.h index ddc02d0b00bc..4232f646ccff 100644 --- a/include/flash_map_pm.h +++ b/include/flash_map_pm.h @@ -24,6 +24,8 @@ #define image_3 mcuboot_secondary_1 #define slot2_partition mcuboot_primary_1 #define slot3_partition mcuboot_secondary_1 +#define slot4_partition mcuboot_primary_2 +#define slot5_partition mcuboot_secondary_2 #define image_scratch mcuboot_scratch #define image_scratch mcuboot_scratch From c6b299adfbe142362c3b22cbc4990e05dacb38a7 Mon Sep 17 00:00:00 2001 From: Dominik Ermel Date: Fri, 11 Aug 2023 16:00:58 +0000 Subject: [PATCH 2/2] manifest: MCUboot and Zephyr changes required for three images Update sdk-mcuboot and sdk-zephyr revisions to bring in changes required for support of three images. Signed-off-by: Dominik Ermel --- west.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/west.yml b/west.yml index ea4f5002df21..2b201242cec5 100644 --- a/west.yml +++ b/west.yml @@ -59,7 +59,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 02956222c991e2c036810a5e39fd60e72aa75866 + revision: pull/1276/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -126,7 +126,7 @@ manifest: compare-by-default: false - name: mcuboot repo-path: sdk-mcuboot - revision: 54319b44950463936e75b4cf898ba5222083a497 + revision: pull/270/head path: bootloader/mcuboot - name: qcbor url: https://github.com/laurencelundblade/QCBOR.git