[nrf noup] loader: Use BOOT_SLOT_PRIMARY and BOOT_SLOT_SECONDARY

nrf-squash! [nrf noup] loader: Do not check reset vector for XIP 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 <[email protected]>

Author: de-nordic

boot/bootutil/src/loader.c

@@ -1167,12 +1167,12 @@ boot_validate_slot(struct boot_loader_state *state, int slot,
      * 0. This part of image is not bootable, as the XIP setup is done by the app in
      * image 0 slot, and it does not carry the reset vector.
      */
-    if (fap == state->imgs[2][BOOT_SECONDARY_SLOT].area) {
+    if (fap == state->imgs[2][BOOT_SLOT_SECONDARY].area) {
         goto out;
     }
 #endif
-    if (fap == BOOT_IMG_AREA(state, BOOT_SECONDARY_SLOT)) {
-        const struct flash_area *pri_fa = BOOT_IMG_AREA(state, BOOT_PRIMARY_SLOT);
+    if (fap == BOOT_IMG_AREA(state, BOOT_SLOT_SECONDARY)) {
+        const struct flash_area *pri_fa = BOOT_IMG_AREA(state, BOOT_SLOT_PRIMARY);
         struct image_header *secondary_hdr = boot_img_hdr(state, slot);
         uint32_t reset_value = 0;
         uint32_t reset_addr = secondary_hdr->ih_hdr_size + sizeof(reset_value);