[nrf noup] boot: bootutil: Fix b0 checks

nrf-squash! [nrf noup] treewide: add NCS partition manager support

Fixes invalid checks for b0 that would wrongly skip checking if
partition sizes were valid for the non-b0 updates when b0 updates
were generally enabled, and ports the check to swap using offset
also

Signed-off-by: Jamie McCrae <[email protected]>

Author: nordicjm

boot/bootutil/src/swap_move.c

@@ -230,6 +230,12 @@ boot_status_internal_off(const struct boot_status *bs, int elem_sz)
 int
 boot_slots_compatible(struct boot_loader_state *state)
 {
+    size_t num_sectors_pri;
+    size_t num_sectors_sec;
+    size_t sector_sz_pri = 0;
+    size_t sector_sz_sec = 0;
+    size_t i;
+
 #ifdef PM_S1_ADDRESS
     /* Patch needed for NCS. In this case, image 1 primary points to the other
      * B1 slot (ie S0 or S1), and image 0 primary points to the app.
@@ -240,13 +246,17 @@ boot_slots_compatible(struct boot_loader_state *state)
      * partition manager is in use, and since we have the same sector size
      * in all of our flash.
      */
+#if CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER != -1
+    if (BOOT_CURR_IMG(state) == CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER) {
         return 1;
-#else
-    size_t num_sectors_pri;
-    size_t num_sectors_sec;
-    size_t sector_sz_pri = 0;
-    size_t sector_sz_sec = 0;
-    size_t i;
+    }
+#endif
+#if CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER != -1
+    if (BOOT_CURR_IMG(state) == CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER) {
+        return 1;
+    }
+#endif
+#endif
 
     num_sectors_pri = boot_img_num_sectors(state, BOOT_SLOT_PRIMARY);
     num_sectors_sec = boot_img_num_sectors(state, BOOT_SLOT_SECONDARY);
@@ -307,7 +317,6 @@ boot_slots_compatible(struct boot_loader_state *state)
     }
 
     return 1;
-#endif /* PM_S1_ADDRESS */
 }
 
 #define BOOT_LOG_SWAP_STATE(area, state)                            \

boot/bootutil/src/swap_offset.c

@@ -310,6 +310,28 @@ int boot_slots_compatible(struct boot_loader_state *state)
     size_t sector_sz_sec = 0;
     size_t i;
 
+#ifdef PM_S1_ADDRESS
+    /* Patch needed for NCS. In this case, image 1 primary points to the other
+     * B1 slot (ie S0 or S1), and image 0 primary points to the app.
+     * With this configuration, image 0 and image 1 share the secondary slot.
+     * Hence, the primary slot of image 1 will be *smaller* than image 1's
+     * secondary slot. This is not allowed in upstream mcuboot, so we need
+     * this patch to allow it. Also, all of these checks are redundant when
+     * partition manager is in use, and since we have the same sector size
+     * in all of our flash.
+     */
+#if CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER != -1
+    if (BOOT_CURR_IMG(state) == CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER) {
+        return 1;
+    }
+#endif
+#if CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER != -1
+    if (BOOT_CURR_IMG(state) == CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER) {
+        return 1;
+    }
+#endif
+#endif
+
     num_sectors_pri = boot_img_num_sectors(state, BOOT_SLOT_PRIMARY);
     num_sectors_sec = boot_img_num_sectors(state, BOOT_SLOT_SECONDARY);
 

boot/bootutil/src/swap_scratch.c

@@ -271,6 +271,16 @@ boot_status_internal_off(const struct boot_status *bs, int elem_sz)
 int
 boot_slots_compatible(struct boot_loader_state *state)
 {
+    size_t num_sectors_primary;
+    size_t num_sectors_secondary;
+    size_t sz0, sz1;
+    size_t primary_slot_sz, secondary_slot_sz;
+#ifndef MCUBOOT_OVERWRITE_ONLY
+    size_t scratch_sz;
+#endif
+    size_t i, j;
+    int8_t smaller;
+
 #ifdef PM_S1_ADDRESS
     /* Patch needed for NCS. In this case, image 1 primary points to the other
      * B1 slot (ie S0 or S1), and image 0 primary points to the app.
@@ -281,17 +291,17 @@ boot_slots_compatible(struct boot_loader_state *state)
      * partition manager is in use, and since we have the same sector size
      * in all of our flash.
      */
+#if CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER != -1
+    if (BOOT_CURR_IMG(state) == CONFIG_MCUBOOT_NETWORK_CORE_IMAGE_NUMBER) {
         return 1;
-#else
-    size_t num_sectors_primary;
-    size_t num_sectors_secondary;
-    size_t sz0, sz1;
-    size_t primary_slot_sz, secondary_slot_sz;
-#ifndef MCUBOOT_OVERWRITE_ONLY
-    size_t scratch_sz;
+    }
+#endif
+#if CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER != -1
+    if (BOOT_CURR_IMG(state) == CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER) {
+        return 1;
+    }
+#endif
 #endif
-    size_t i, j;
-    int8_t smaller;
 
     num_sectors_primary = boot_img_num_sectors(state, BOOT_SLOT_PRIMARY);
     num_sectors_secondary = boot_img_num_sectors(state, BOOT_SLOT_SECONDARY);
@@ -380,7 +390,6 @@ boot_slots_compatible(struct boot_loader_state *state)
 #endif
 
     return 1;
-#endif /* PM_S1_ADDRESS */
 }
 
 #define BOOT_LOG_SWAP_STATE(area, state)                            \