commit c2e30cf2c3331547e36e0e264727065489c0edc0
author Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no> Fri Jul 20 16:19:09 2018 +0200
committer Fabio Utzig <utzig@utzig.org> Sat Aug 04 09:13:23 2018 -0300
tree 889680a3f9b5501a1860382c789cd1d63e76bbdb
parent 205c8c698007602ae349b2f4b42943966482dac3

serial recovery: always erase image status

It is possible that while flash was erased progressively
the flash image status page was not erased.
This patch check this case and performs additional eras
if it was required.

Signed-off-by: Andrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>

boot/boot_serial/src/boot_serial.c

diff --git a/boot/boot_serial/src/boot_serial.c b/boot/boot_serial/src/boot_serial.c
index b2be12b..b734b6a 100644
--- a/boot/boot_serial/src/boot_serial.c
+++ b/boot/boot_serial/src/boot_serial.c
@@ -55,6 +55,10 @@
 #include "boot_serial/boot_serial.h"
 #include "boot_serial_priv.h"
 
+#ifdef CONFIG_BOOT_ERASE_PROGRESSIVELY
+#include "bootutil_priv.h"
+#endif
+
 #define BOOT_SERIAL_INPUT_MAX   512
 #define BOOT_SERIAL_OUT_MAX	80
 
@@ -354,7 +358,7 @@
     }
     if (off_last != sector.fs_off) {
         off_last = sector.fs_off;
-        BOOT_LOG_INF("Moving to sector 0x%x", sector.fs_off);
+        BOOT_LOG_INF("Erasing sector at offset 0x%x", sector.fs_off);
         rc = flash_area_erase(fap, sector.fs_off, sector.fs_size);
         if (rc) {
             BOOT_LOG_ERR("Error %d while erasing sector", rc);
@@ -367,6 +371,27 @@
     rc = flash_area_write(fap, curr_off, img_data, img_blen);
     if (rc == 0) {
         curr_off += img_blen;
+#ifdef CONFIG_BOOT_ERASE_PROGRESSIVELY
+        if (curr_off == img_size) {
+            /* get the last sector offset */
+            rc = flash_area_sector_from_off(boot_status_off(fap), &sector);
+            if (rc) {
+                BOOT_LOG_ERR("Unable to determine flash sector of"
+                             "the image trailer");
+                goto out;
+            }
+            /* Assure that sector for image trailer was erased. */
+            /* Check whether it was erased during previous upload. */
+            if (off_last < sector.fs_off) {
+                BOOT_LOG_INF("Erasing sector at offset 0x%x", sector.fs_off);
+                rc = flash_area_erase(fap, sector.fs_off, sector.fs_size);
+                if (rc) {
+                    BOOT_LOG_ERR("Error %d while erasing sector", rc);
+                    goto out;
+                }
+            }
+        }
+#endif
     } else {
     out_invalid_data:
         rc = MGMT_ERR_EINVAL;