[nrf noup] nrf53: add support for multi image DFU

Some long descriptive text.

Signed-off-by: Håkon Øye Amundsen <[email protected]>

Author: hakonfam

boot/zephyr/include/sysflash/sysflash.h

@@ -16,6 +16,8 @@
 
 #elif (MCUBOOT_IMAGE_NUMBER == 2)
 
+#ifdef CONFIG_SECURE_BOOT
+
 extern uint32_t _image_1_primary_slot_id[];
 
 #define FLASH_AREA_IMAGE_PRIMARY(x)            \
@@ -31,6 +33,24 @@ extern uint32_t _image_1_primary_slot_id[];
         (x == 1) ?                    \
            PM_MCUBOOT_SECONDARY_ID:   \
            255 )
+#else
+
+#define FLASH_AREA_IMAGE_PRIMARY(x)          \
+        ((x == 0) ?                          \
+           PM_MCUBOOT_PRIMARY_ID :           \
+         (x == 1) ?                          \
+           PM_MCUBOOT_PRIMARY_1_ID :         \
+           255 )
+
+#define FLASH_AREA_IMAGE_SECONDARY(x) \
+        ((x == 0) ?                   \
+           PM_MCUBOOT_SECONDARY_ID:   \
+        (x == 1) ?                    \
+           PM_MCUBOOT_SECONDARY_1_ID: \
+           255 )
+
+#endif /* CONFIG_SECURE_BOOT */
+
 #endif
 #define FLASH_AREA_IMAGE_SCRATCH    PM_MCUBOOT_SCRATCH_ID
 

boot/zephyr/pm.yml

@@ -49,3 +49,14 @@ mcuboot_pad:
 #ifdef CONFIG_FPROTECT
     align: {start: CONFIG_FPROTECT_BLOCK_SIZE}
 #endif
+
+#if (CONFIG_NRF53_MULTI_IMAGE_UPDATE)
+mcuboot_primary_1:
+  region: ram_flash
+  size: CONFIG_NRF53_RAM_FLASH_SIZE
+
+mcuboot_secondary_1:
+  region: external_flash
+  size: CONFIG_NRF53_RAM_FLASH_SIZE
+
+#endif /* CONFIG_NRF53_MULTI_IMAGE_UPDATE */