Skip to content

Commit 45991fe

Browse files
committed
Revert "boot/bootutil: Add MCUBOOT_SINGLE_APPLICATION_SLOT_RAM_LOAD mode"
This reverts commit 5c67fb9. Signed-off-by: Jamie McCrae <[email protected]>
1 parent fc0603f commit 45991fe

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

boot/bootutil/include/bootutil/boot_status.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,7 @@ enum mcuboot_mode {
128128
MCUBOOT_MODE_DIRECT_XIP,
129129
MCUBOOT_MODE_DIRECT_XIP_WITH_REVERT,
130130
MCUBOOT_MODE_RAM_LOAD,
131-
MCUBOOT_MODE_FIRMWARE_LOADER,
132-
MCUBOOT_MODE_SINGLE_SLOT_RAM_LOAD,
131+
MCUBOOT_MODE_FIRMWARE_LOADER
133132
};
134133

135134
enum mcuboot_signature_type {

boot/bootutil/src/boot_record.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,6 @@ int boot_save_shared_data(const struct image_header *hdr, const struct flash_are
253253
uint8_t mode = MCUBOOT_MODE_RAM_LOAD;
254254
#elif defined(MCUBOOT_FIRMWARE_LOADER)
255255
uint8_t mode = MCUBOOT_MODE_FIRMWARE_LOADER;
256-
#elif defined(MCUBOOT_SINGLE_APPLICATION_SLOT_RAM_LOAD)
257-
uint8_t mode = MCUBOOT_MODE_SINGLE_SLOT_RAM_LOAD;
258256
#else
259257
#error "Unknown mcuboot operating mode"
260258
#endif

boot/bootutil/src/bootutil_misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ boot_write_enc_key(const struct flash_area *fap, uint8_t slot,
334334
uint32_t bootutil_max_image_size(const struct flash_area *fap)
335335
{
336336
#if defined(MCUBOOT_SWAP_USING_SCRATCH) || defined(MCUBOOT_SINGLE_APPLICATION_SLOT) || \
337-
defined(MCUBOOT_FIRMWARE_LOADER) || defined(MCUBOOT_SINGLE_APPLICATION_SLOT_RAM_LOAD)
337+
defined(MCUBOOT_FIRMWARE_LOADER)
338338
return boot_status_off(fap);
339339
#elif defined(MCUBOOT_SWAP_USING_MOVE)
340340
struct flash_sector sector;

0 commit comments

Comments
 (0)