commit 7fd42d5ff98509474d5e386a9ef219c16a705822
author Fabio Utzig <fabio.utzig@nordicsemi.no> Wed Oct 28 09:04:41 2020 -0300
committer Fabio Utzig <utzig@utzig.org> Wed Oct 28 18:16:48 2020 -0300
tree 791984fdef8f2377766b44a7f2ed88c3c8378b1b
parent 3c1e4fbddae1340746841fe65bb13a54eac9481f

Revert "bootutil: fix swap-move brick with padded image0"

This reverts commit 296949ef6dea8fc8f5fe566277bfd3fa984473cb.

Signed-off-by: Fabio Utzig <fabio.utzig@nordicsemi.no>

boot/bootutil/src/swap_move.c

diff --git a/boot/bootutil/src/swap_move.c b/boot/bootutil/src/swap_move.c
index 8c59843..d7c9ad4 100644
--- a/boot/bootutil/src/swap_move.c
+++ b/boot/bootutil/src/swap_move.c
@@ -315,11 +315,13 @@
     old_off = boot_img_sector_off(state, BOOT_PRIMARY_SLOT, idx - 1);
 
     if (bs->idx == BOOT_STATUS_IDX_0) {
-        rc = swap_erase_trailer_sectors(state, fap_pri);
-        assert(rc == 0);
+        if (bs->source != BOOT_STATUS_SOURCE_PRIMARY_SLOT) {
+            rc = swap_erase_trailer_sectors(state, fap_pri);
+            assert(rc == 0);
 
-        rc = swap_status_init(state, fap_pri, bs);
-        assert(rc == 0);
+            rc = swap_status_init(state, fap_pri, bs);
+            assert(rc == 0);
+        }
 
         rc = swap_erase_trailer_sectors(state, fap_sec);
         assert(rc == 0);