Commit 54b4ad9f authored by Andrzej Puzdrowski's avatar Andrzej Puzdrowski Committed by David Brown
Browse files

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: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parent 1c456247

boot/bootutil/include/bootutil/bootutil_public.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ extern "C" { 
#define BOOT_ENOMEM      6

#define BOOT_EBADARGS    7

#define BOOT_EBADVERSION 8

#define BOOT_EFLASH_SEC  9



/*

 * Extract the swap type and image number from image trailers's swap_info

boot/bootutil/src/loader.c

+7 −2
Original line number Diff line number Diff line
@@ -360,7 +360,8 @@ boot_read_sectors(struct boot_loader_state *state) 


    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,8 +1654,12 @@ boot_prepare_image_for_update(struct boot_loader_state *state, 
         * if there is one.

         */

        BOOT_SWAP_TYPE(state) = BOOT_SWAP_TYPE_NONE;

        if (rc == BOOT_EFLASH)

        {

            /* Only return on error from the primary image flash */

            return;

        }

    }



    /* Attempt to read an image header from each slot. */

    rc = boot_read_image_headers(state, false, NULL);

CRA Git | Maintained and supported by SUSTech CRA and CCSE