[nrf noup] loader: Use BOOT_SLOT_PRIMARY and BOOT_SLOT_SECONDARY

de-nordic · jukkar · commit 98b6e78de31d · 2025-09-23T13:04:33.000+03:00
nrf-squash! [nrf noup] boot: Add support for NSIB and multi-image

The commit replaces BOOT_PRIMARY_SLOT and BOOT_SECONDARY_SLOT
with BOOT_SLOT_PRIMARY and BOOT_SLOT_SECONDARY respectively.

Signed-off-by: Dominik Ermel &lt;dominik.ermel@nordicsemi.no&gt;
diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
@@ -1490,7 +1490,7 @@ boot_validated_swap_type(struct boot_loader_state *state,
         {
             const struct flash_area *primary_fa;
             rc = flash_area_open(flash_area_id_from_multi_image_slot(
-                                 BOOT_CURR_IMG(state), BOOT_PRIMARY_SLOT),
+                                 BOOT_CURR_IMG(state), BOOT_SLOT_PRIMARY),
                                  &primary_fa);
             if (rc != 0) {
                 return BOOT_SWAP_TYPE_FAIL;

Original file line number	Diff line number	Diff line change
`@@ -1490,7 +1490,7 @@ boot_validated_swap_type(struct boot_loader_state *state,`
`1490`	`1490`	`{`
`1491`	`1491`	`const struct flash_area *primary_fa;`
`1492`	`1492`	`rc = flash_area_open(flash_area_id_from_multi_image_slot(`
`1493`		`- BOOT_CURR_IMG(state), BOOT_PRIMARY_SLOT),`
	`1493`	`+ BOOT_CURR_IMG(state), BOOT_SLOT_PRIMARY),`
`1494`	`1494`	`&primary_fa);`
`1495`	`1495`	`if (rc != 0) {`
`1496`	`1496`	`return BOOT_SWAP_TYPE_FAIL;`