[nrf noup] loader: Use BOOT_SLOT_PRIMARY and BOOT_SLOT_SECONDARY

fixup! [nrf noup] boot: bootutil: loader: Add s0/s1 checking of MCUboot 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

@@ -1084,7 +1084,7 @@ boot_validate_slot(struct boot_loader_state *state, int slot,
                  */
                 int version_check;
 
-                version_check = boot_version_cmp(&boot_img_hdr(state, BOOT_SECONDARY_SLOT)->ih_ver,
+                version_check = boot_version_cmp(&boot_img_hdr(state, BOOT_SLOT_SECONDARY)->ih_ver,
                                                  &mcuboot_s0_s1_image_version);
 
                 /* Only update rc if the currently running version is newer */
@@ -1106,7 +1106,7 @@ boot_validate_slot(struct boot_loader_state *state, int slot,
              */
             int version_check;
 
-            version_check = boot_version_cmp(&boot_img_hdr(state, BOOT_SECONDARY_SLOT)->ih_ver,
+            version_check = boot_version_cmp(&boot_img_hdr(state, BOOT_SLOT_SECONDARY)->ih_ver,
                                              &mcuboot_s0_s1_image_version);
 
             /* Only update rc if the currently running version is newer */