[nrf noup] loader: Use BOOT_SLOT_PRIMARY and BOOT_SLOT_SECONDARY

de-nordic · jukkar · commit ea6bb5c46762 · 2025-09-23T13:04:33.000+03:00
nrf-squash! [nrf noup] treewide: add NCS partition manager support

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
@@ -2951,7 +2951,7 @@ context_boot_go(struct boot_loader_state *state, struct boot_rsp *rsp)
         if (!image_validated_by_nsib)
 #endif
         {
-            FIH_CALL(boot_validate_slot, fih_rc, state, BOOT_PRIMARY_SLOT, NULL, 0);
+            FIH_CALL(boot_validate_slot, fih_rc, state, BOOT_SLOT_PRIMARY, NULL, 0);
             /* Check for all possible values is redundant in normal operation it
              * is meant to prevent FI attack.
              */

Original file line number	Diff line number	Diff line change
`@@ -2951,7 +2951,7 @@ context_boot_go(struct boot_loader_state state, struct boot_rsp rsp)`
`2951`	`2951`	`if (!image_validated_by_nsib)`
`2952`	`2952`	`#endif`
`2953`	`2953`	`{`
`2954`		`- FIH_CALL(boot_validate_slot, fih_rc, state, BOOT_PRIMARY_SLOT, NULL, 0);`
	`2954`	`+ FIH_CALL(boot_validate_slot, fih_rc, state, BOOT_SLOT_PRIMARY, NULL, 0);`
`2955`	`2955`	`/* Check for all possible values is redundant in normal operation it`
`2956`	`2956`	`* is meant to prevent FI attack.`
`2957`	`2957`	`*/`