commit 258a6c7dc2c5016acf665069c9a9b90ec18da5cf
author Jamie McCrae <jamie.mccrae@nordicsemi.no> Thu Aug 17 13:33:39 2023 +0100
committer Dominik Ermel <56024351+de-nordic@users.noreply.github.com> Thu Aug 17 16:00:12 2023 +0200
tree 2f470884d50f9097ecd869c93de8a7fd921d7436
parent b206b99b1555ca15f790a3287e57dc98ef3df2ac

bootutil: Fix support for more than 2 flash areas

Fixes a function which converts from an ID to an image number
to support more than 2 images.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

boot/bootutil/src/bootutil_public.c

diff --git a/boot/bootutil/src/bootutil_public.c b/boot/bootutil/src/bootutil_public.c
index 8e70086..f54dd22 100644
--- a/boot/bootutil/src/bootutil_public.c
+++ b/boot/bootutil/src/bootutil_public.c
@@ -460,11 +460,15 @@
 
 static int flash_area_id_to_image(int id)
 {
-#if BOOT_IMAGE_NUMBER > 2
-#error "BOOT_IMAGE_NUMBER > 2 requires change to flash_area_id_to_image"
-#elif BOOT_IMAGE_NUMBER > 1
-    if (FLASH_AREA_IMAGE_PRIMARY(1) == id || (FLASH_AREA_IMAGE_SECONDARY(1) == id)) {
-        return 1;
+#if BOOT_IMAGE_NUMBER > 1
+    uint8_t i = 0;
+
+    while (i < BOOT_IMAGE_NUMBER) {
+        if (FLASH_AREA_IMAGE_PRIMARY(i) == id || (FLASH_AREA_IMAGE_SECONDARY(i) == id)) {
+            return i;
+        }
+
+        ++i;
     }
 #else
     (void)id;