commit 94d998c61b49d08502472bf5be5f851d8ec1bc6f
author Fabio Utzig <utzig@utzig.org> Mon May 22 11:02:41 2017 -0400
committer Fabio Utzig <utzig@utzig.org> Wed May 24 09:16:14 2017 -0400
tree 51b27268d5ad70bae609734f3db05f886cf734b5
parent 4cee4f758f9d720696c5b1c59f26f690756b8777

Remove special cases, non needed tests

boot/bootutil/src/loader.c

diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index 1b0a1f0..dbf2c1e 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -413,14 +413,8 @@
 
     if (found) {
         i--;
-        /* FIXME: is this test required? */
-        if (fap->fa_id != FLASH_AREA_IMAGE_SCRATCH) {
-            bs->idx = i / BOOT_STATUS_STATE_COUNT;
-            bs->state = i % BOOT_STATUS_STATE_COUNT;
-        } else {
-            bs->idx = 0;
-            bs->state = i;
-        }
+        bs->idx = i / BOOT_STATUS_STATE_COUNT;
+        bs->state = i % BOOT_STATUS_STATE_COUNT;
     }
 
     return 0;
@@ -931,7 +925,7 @@
                               0, img_off, copy_sz);
         assert(rc == 0);
 
-        if (bs->idx == 0 && bs->use_scratch) {
+        if (bs->use_scratch) {
             rc = flash_area_open(FLASH_AREA_IMAGE_SCRATCH, &fap);
             assert(rc == 0);