Commit 45991fe7 authored by Jamie McCrae's avatar Jamie McCrae Committed by Jamie
Browse files

Revert "boot/bootutil: Add MCUBOOT_SINGLE_APPLICATION_SLOT_RAM_LOAD mode" 



This reverts commit 5c67fb99.

Signed-off-by: default avatarJamie McCrae <jamie.mccrae@nordicsemi.no>
parent fc0603fe

boot/bootutil/include/bootutil/boot_status.h

+1 −2
Original line number Diff line number Diff line
@@ -128,8 +128,7 @@ enum mcuboot_mode { 
    MCUBOOT_MODE_DIRECT_XIP,

    MCUBOOT_MODE_DIRECT_XIP_WITH_REVERT,

    MCUBOOT_MODE_RAM_LOAD,

    MCUBOOT_MODE_FIRMWARE_LOADER,

    MCUBOOT_MODE_SINGLE_SLOT_RAM_LOAD,

    MCUBOOT_MODE_FIRMWARE_LOADER

};



enum mcuboot_signature_type {

boot/bootutil/src/boot_record.c

+0 −2
Original line number Diff line number Diff line
@@ -253,8 +253,6 @@ int boot_save_shared_data(const struct image_header *hdr, const struct flash_are 
    uint8_t mode = MCUBOOT_MODE_RAM_LOAD;

#elif defined(MCUBOOT_FIRMWARE_LOADER)

    uint8_t mode = MCUBOOT_MODE_FIRMWARE_LOADER;

#elif defined(MCUBOOT_SINGLE_APPLICATION_SLOT_RAM_LOAD)

    uint8_t mode = MCUBOOT_MODE_SINGLE_SLOT_RAM_LOAD;

#else

#error "Unknown mcuboot operating mode"

#endif

boot/bootutil/src/bootutil_misc.c

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ boot_write_enc_key(const struct flash_area *fap, uint8_t slot, 
uint32_t bootutil_max_image_size(const struct flash_area *fap)

{

#if defined(MCUBOOT_SWAP_USING_SCRATCH) || defined(MCUBOOT_SINGLE_APPLICATION_SLOT) || \

    defined(MCUBOOT_FIRMWARE_LOADER) || defined(MCUBOOT_SINGLE_APPLICATION_SLOT_RAM_LOAD)

    defined(MCUBOOT_FIRMWARE_LOADER)

    return boot_status_off(fap);

#elif defined(MCUBOOT_SWAP_USING_MOVE)

    struct flash_sector sector;

CRA Git | Maintained and supported by SUSTech CRA and CCSE