Skip to content

Commit c513187

Browse files
de-nordicnordicjm
authored andcommitted
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 e5c0078. Signed-off-by: Dominik Ermel <[email protected]>
1 parent 602cb45 commit c513187

File tree

5 files changed

+0
-10
lines changed

5 files changed

+0
-10
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@
8383
// TODO: FWSECURITY-755
8484
#define MCUBOOT_USE_FLASH_AREA_GET_SECTORS
8585

86-
#define MCUBOOT_DEV_WITH_ERASE
87-
8886
/* Default number of separately updateable images; change in case of
8987
* multiple images. */
9088
#ifndef MCUBOOT_IMAGE_NUMBER

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,6 @@
126126
* See the flash APIs for more details. */
127127
#define MCUBOOT_USE_FLASH_AREA_GET_SECTORS
128128

129-
#define MCUBOOT_DEV_WITH_ERASE
130-
131129
/* Default maximum number of flash sectors per image slot; change
132130
* as desirable. */
133131
#define MCUBOOT_MAX_IMG_SECTORS 512

boot/mbed/include/mcuboot_config/mcuboot_config.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@
7878
*/
7979
#define MCUBOOT_USE_FLASH_AREA_GET_SECTORS
8080

81-
#define MCUBOOT_DEV_WITH_ERASE
82-
8381
/*
8482
* No watchdog integration for now
8583
*/

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,6 @@
137137
#define MCUBOOT_BOOT_MAX_ALIGN MYNEWT_VAL(MCU_FLASH_MIN_WRITE_SIZE)
138138
#endif
139139

140-
#define MCUBOOT_DEV_WITH_ERASE
141-
142140
#if MYNEWT_VAL(BOOTUTIL_FEED_WATCHDOG) && MYNEWT_VAL(WATCHDOG_INTERVAL)
143141
#include <hal/hal_watchdog.h>
144142
#define MCUBOOT_WATCHDOG_FEED() \

boot/nuttx/include/mcuboot_config/mcuboot_config.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,6 @@
132132

133133
#define MCUBOOT_USE_FLASH_AREA_GET_SECTORS
134134

135-
#define MCUBOOT_DEV_WITH_ERASE
136-
137135
/* Default maximum number of flash sectors per image slot; change
138136
* as desirable.
139137
*/

0 commit comments

Comments
 (0)