Commit c5131870 authored by Dominik Ermel's avatar Dominik Ermel Committed by Jamie
Browse files

Revert "boot: Enable MCUBOOT_DEV_WITH_ERASE in other systems" 



Need to revert changes provided to support devices without erase
until problme with TF-M, missing implementation of flash_area_get_sector,
is resolved.

This reverts commit e5c0078f.

Signed-off-by: default avatarDominik Ermel <dominik.ermel@nordicsemi.no>
parent 602cb459

boot/cypress/MCUBootApp/config/mcuboot_config/mcuboot_config.h

+0 −2
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ 
// TODO: FWSECURITY-755

#define MCUBOOT_USE_FLASH_AREA_GET_SECTORS



#define MCUBOOT_DEV_WITH_ERASE



/* Default number of separately updateable images; change in case of

 * multiple images. */

#ifndef MCUBOOT_IMAGE_NUMBER

boot/espressif/hal/include/mcuboot_config/mcuboot_config.h

+0 −2
Original line number Diff line number Diff line
@@ -126,8 +126,6 @@ 
 * See the flash APIs for more details. */

#define MCUBOOT_USE_FLASH_AREA_GET_SECTORS



#define MCUBOOT_DEV_WITH_ERASE



/* Default maximum number of flash sectors per image slot; change

 * as desirable. */

#define MCUBOOT_MAX_IMG_SECTORS 512

boot/mbed/include/mcuboot_config/mcuboot_config.h

+0 −2
Original line number Diff line number Diff line
@@ -78,8 +78,6 @@ 
 */

#define MCUBOOT_USE_FLASH_AREA_GET_SECTORS



#define MCUBOOT_DEV_WITH_ERASE



/*

 * No watchdog integration for now

 */

boot/mynewt/mcuboot_config/include/mcuboot_config/mcuboot_config.h

+0 −2
Original line number Diff line number Diff line
@@ -137,8 +137,6 @@ 
#define MCUBOOT_BOOT_MAX_ALIGN  MYNEWT_VAL(MCU_FLASH_MIN_WRITE_SIZE)

#endif



#define MCUBOOT_DEV_WITH_ERASE



#if MYNEWT_VAL(BOOTUTIL_FEED_WATCHDOG) && MYNEWT_VAL(WATCHDOG_INTERVAL)

#include <hal/hal_watchdog.h>

#define MCUBOOT_WATCHDOG_FEED()    \

boot/nuttx/include/mcuboot_config/mcuboot_config.h

+0 −2
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ 


#define MCUBOOT_USE_FLASH_AREA_GET_SECTORS



#define MCUBOOT_DEV_WITH_ERASE



/* Default maximum number of flash sectors per image slot; change

 * as desirable.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE