[nrf noup] pm_sysflash: Fix slot mismatch between app and mcuboot

When CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER != -1 there is a
size mismatch of all_slots between mcuboot and application images.

When enabling mcuboot for example with s0 and s1 secure images,
the mcuboot reported size is 6 while the application reported size is 4.
When the application references FLASH_AREA_IMAGE_SECONDARY() it
receives the s0 bootloader slot id instead.
Methods that rely on FLASH_AREA_IMAGE_SECONDARY() to point to
the application secondary slot do not work as expected.

Since MCUBOOT_IMAGE_NUMBER is finite and currently limited to 4
slots, The ALL_AVAILABLE_SLOTS macro definition should check
each combination of CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER
explicitly to verify the combination is correct.

Signed-off-by: Anthony Williams <[email protected]>

Author: anthony289478

boot/zephyr/include/sysflash/pm_sysflash.h

@@ -31,12 +31,12 @@
 #define MCUBOOT_S0_S1_SLOTS
 #endif
 
-#if (MCUBOOT_IMAGE_NUMBER == 1) || (MCUBOOT_IMAGE_NUMBER == 2 && CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER != -1)
+#if (MCUBOOT_IMAGE_NUMBER == 1) || (MCUBOOT_IMAGE_NUMBER == 2 && CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER == 1)
 #define ALL_AVAILABLE_SLOTS FLASH_AREA_IMAGE_0_SLOTS
-#elif (MCUBOOT_IMAGE_NUMBER == 2) || (MCUBOOT_IMAGE_NUMBER == 3 && CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER != -1)
+#elif (MCUBOOT_IMAGE_NUMBER == 2) || (MCUBOOT_IMAGE_NUMBER == 3 && CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER == 2)
 #define ALL_AVAILABLE_SLOTS FLASH_AREA_IMAGE_0_SLOTS \
                             FLASH_AREA_IMAGE_1_SLOTS
-#elif (MCUBOOT_IMAGE_NUMBER == 3) || (MCUBOOT_IMAGE_NUMBER == 4 && CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER != -1)
+#elif (MCUBOOT_IMAGE_NUMBER == 3) || (MCUBOOT_IMAGE_NUMBER == 4 && CONFIG_MCUBOOT_MCUBOOT_IMAGE_NUMBER == 3)
 #define ALL_AVAILABLE_SLOTS FLASH_AREA_IMAGE_0_SLOTS \
                             FLASH_AREA_IMAGE_1_SLOTS \
                             FLASH_AREA_IMAGE_2_SLOTS