Revert "zephyr: Use flash_area_flatten in bs_custom_storage_erase"

de-nordic · nordicjm · commit 9c84013b7e32 · 2025-02-19T07:18:17.000Z
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 ecd4877. Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
diff --git a/boot/zephyr/boot_serial_extension_zephyr_basic.c b/boot/zephyr/boot_serial_extension_zephyr_basic.c
@@ -47,7 +47,7 @@ static int bs_custom_storage_erase(const struct nmgr_hdr *hdr,
     if (rc < 0) {
         BOOT_LOG_ERR("failed to open flash area");
     } else {
-        rc = flash_area_flatten(fa, 0, flash_area_get_size(fa));
+        rc = flash_area_erase(fa, 0, flash_area_get_size(fa));
         if (rc < 0) {
             BOOT_LOG_ERR("failed to erase flash area");
         }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ static int bs_custom_storage_erase(const struct nmgr_hdr *hdr,`
`47`	`47`	`if (rc < 0) {`
`48`	`48`	`BOOT_LOG_ERR("failed to open flash area");`
`49`	`49`	`} else {`
`50`		`- rc = flash_area_flatten(fa, 0, flash_area_get_size(fa));`
	`50`	`+ rc = flash_area_erase(fa, 0, flash_area_get_size(fa));`
`51`	`51`	`if (rc < 0) {`
`52`	`52`	`BOOT_LOG_ERR("failed to erase flash area");`
`53`	`53`	`}`