commit 54b4ad9fd7ae11ddd2599262c15c3b507d92a48b
author Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Tue Jun 22 13:21:22 2021 +0200
committer David Brown <davidb@davidb.org> Tue Jul 06 12:11:03 2021 -0600
tree 4d11f1cf4261cc0ac2f0d8d79911dda8161aaea5
parent 1c4562473e4a82e8e6b641b223a935c48e0b5b74

bootutil/loader: Allow not working secondary image device

Let's distinguish a case when secondary image device has a malfunction
from case when primary has a such.
It might be still possible to boot the primary image.

This make sens especially if the secondary image resides in an
external flash which might be damaged while SoC is still working.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

boot/bootutil/src/loader.c

diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index 2a2d14a..b0d3329 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -360,7 +360,8 @@
 
     rc = boot_initialize_area(state, FLASH_AREA_IMAGE_SECONDARY(image_index));
     if (rc != 0) {
-        return BOOT_EFLASH;
+        /* We need to differentiate from the primary image issue */
+        return BOOT_EFLASH_SEC;
     }
 
 #if MCUBOOT_SWAP_USING_SCRATCH
@@ -1653,7 +1654,11 @@
          * if there is one.
          */
         BOOT_SWAP_TYPE(state) = BOOT_SWAP_TYPE_NONE;
-        return;
+        if (rc == BOOT_EFLASH)
+        {
+            /* Only return on error from the primary image flash */
+            return;
+        }
     }
 
     /* Attempt to read an image header from each slot. */