dfu: depend on IMG_ERASE_PROGRESSIVELY

hakonfam · thst-nordic · commit 77a320527868 · 2019-11-12T01:25:12.000+01:00
This fixes bug where only one DFU procedure could be performed
as the flash was not erased between the operations.

Signed-off-by: Håkon Øye Amundsen &lt;haakon.amundsen@nordicsemi.no&gt;
diff --git a/applications/asset_tracker/prj.conf b/applications/asset_tracker/prj.conf
@@ -84,6 +84,7 @@ CONFIG_MCUBOOT_IMG_MANAGER=y
 
 # Flash
 CONFIG_FLASH=y
+CONFIG_IMG_ERASE_PROGRESSIVELY=y
 
 # AWS FOTA
 CONFIG_AWS_FOTA=y
diff --git a/applications/asset_tracker/prj_nrf9160_pca20035ns.conf b/applications/asset_tracker/prj_nrf9160_pca20035ns.conf
@@ -111,6 +111,7 @@ CONFIG_MPU_ALLOW_FLASH_WRITE=y
 CONFIG_BOOTLOADER_MCUBOOT=y
 CONFIG_IMG_MANAGER=y
 CONFIG_MCUBOOT_IMG_MANAGER=y
+CONFIG_IMG_ERASE_PROGRESSIVELY=y
 
 # AWS FOTA
 CONFIG_AWS_FOTA=y
diff --git a/samples/nrf9160/aws_fota/prj.conf b/samples/nrf9160/aws_fota/prj.conf
@@ -48,6 +48,7 @@ CONFIG_BOOTLOADER_MCUBOOT=y
 # Image manager
 CONFIG_IMG_MANAGER=y
 CONFIG_FLASH=y
+CONFIG_IMG_ERASE_PROGRESSIVELY=y
 
 # Enable Log
 CONFIG_LOG=y
diff --git a/samples/nrf9160/http_application_update/prj.conf b/samples/nrf9160/http_application_update/prj.conf
@@ -41,6 +41,7 @@ CONFIG_MAIN_STACK_SIZE=8192
 # Image manager
 CONFIG_IMG_MANAGER=y
 CONFIG_FLASH=y
+CONFIG_IMG_ERASE_PROGRESSIVELY=y
 
 # GPIO
 CONFIG_GPIO=y
diff --git a/subsys/dfu/Kconfig b/subsys/dfu/Kconfig
@@ -14,6 +14,7 @@ config DFU_TARGET_MCUBOOT
 	default y
 	depends on IMG_MANAGER
 	depends on BOOTLOADER_MCUBOOT
+	depends on IMG_ERASE_PROGRESSIVELY
 	imply MPU_ALLOW_FLASH_WRITE
 	help
 	  Enable support for updates that are performed by MCUboot.
diff --git a/tests/subsys/dfu/dfu_target/mcuboot/prj.conf b/tests/subsys/dfu/dfu_target/mcuboot/prj.conf
@@ -5,6 +5,7 @@
 #
 CONFIG_ZTEST=y
 CONFIG_FLASH=y
+CONFIG_IMG_ERASE_PROGRESSIVELY=y
 CONFIG_BOOTLOADER_MCUBOOT=n
 CONFIG_IMG_MANAGER=y
 CONFIG_DFU_TARGET=y

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`#`
`6`	`6`	`CONFIG_ZTEST=y`
`7`	`7`	`CONFIG_FLASH=y`
	`8`	`+CONFIG_IMG_ERASE_PROGRESSIVELY=y`
`8`	`9`	`CONFIG_BOOTLOADER_MCUBOOT=n`
`9`	`10`	`CONFIG_IMG_MANAGER=y`
`10`	`11`	`CONFIG_DFU_TARGET=y`