zephyr: Remove deprecated ZEPHYR_TRY_MASS_ERASE option

This option was deprecated 8 months ago, remove it.

Signed-off-by: Jamie McCrae <[email protected]>

boot/zephyr/CMakeLists.txt

@@ -6,26 +6,6 @@
 
 cmake_minimum_required(VERSION 3.13.1)
 
-# Enable Zephyr runner options which request mass erase if so
-# configured.
-#
-# Note that this also disables the default "leave" option when
-# targeting STM32 DfuSe devices with dfu-util, making the chip stay in
-# the bootloader after flashing.
-#
-# That's the right thing, because mcuboot has nothing to do since the
-# chip was just erased. The next thing the user is going to want to do
-# is flash the application. (Developers can reset DfuSE devices
-# manually to test mcuboot behavior on an otherwise erased flash
-# device.)
-macro(app_set_runner_args)
-  if(CONFIG_ZEPHYR_TRY_MASS_ERASE)
-    board_runner_args(dfu-util "--dfuse-modifiers=force:mass-erase")
-    board_runner_args(pyocd "--flash-opt=-e=chip")
-    board_runner_args(nrfjprog "--erase")
-  endif()
-endmacro()
-
 # find_package(Zephyr) in order to load application boilerplate:
 # http://docs.zephyrproject.org/application/application.html
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})

boot/zephyr/Kconfig

@@ -546,20 +546,6 @@ config BOOT_USB_DFU_DETECT_DELAY
 
 endif # BOOT_USB_DFU_GPIO
 
-config ZEPHYR_TRY_MASS_ERASE
-	bool "Try to mass erase flash when flashing MCUboot image (DEPRECATED)"
-	select DEPRECATED
-	help
-	  If y, attempt to configure the Zephyr build system's "flash"
-	  target to mass-erase the flash device before flashing the
-	  MCUboot image. This ensures the scratch and other partitions
-	  are in a consistent state.
-
-	  This is not available for all targets.
-
-	  This option has been deprecated, to perform a mass erase when
-	  flashing a board, `west flash --erase` should be used instead.
-
 config BOOT_USE_BENCH
         bool "Enable benchmark code"
         default n

boot/zephyr/boards/nrf52_minimal_footprint.conf

@@ -16,7 +16,6 @@ CONFIG_BOOT_SIGNATURE_KEY_FILE="root-ec-p256.pem"
 # by reliability reason.
 CONFIG_BOOT_UPGRADE_ONLY=y
 
-# CONFIG_ZEPHYR_TRY_MASS_ERASE is not set
 # CONFIG_BOARD_ENABLE_DCDC is not set
 CONFIG_SOC_SERIES_NRF52X=y
 CONFIG_SOC_NRF52832_QFAA=y