Addressed reviewer's comments.

Author: danielinux

include/image.h

@@ -613,6 +613,10 @@ static void __attribute__((noinline)) wolfBoot_image_clear_signature_ok(
         "b end_check\n" \
         "ver_panic:\n" \
         "b .\n" \
+        "b .\n" \
+        "b .\n" \
+        "b .\n" \
+        "b .\n" \
         "end_check:\n" \
         "pop {r4, r5, r6, r7}\n" \
         : \
@@ -639,16 +643,20 @@ static void __attribute__((noinline)) wolfBoot_image_clear_signature_ok(
             "mov r0, %0\n" \
             "mov r4, %0\n" \
             "cmp r0, #0\n" \
+            "bne 6f\n" \
             "beq 4f\n" \
+            "6:\n" \
             "cmp r0, #1\n" \
+            "bne 4f\n" \
             "beq 4f\n" \
-            "bkpt 0xE1\n" \
             "4:\n" \
             "cmp r4, #0\n" \
+            "bne 7f\n" \
             "beq 5f\n" \
+            "7:\n" \
             "cmp r4, #1\n" \
+            "bne 5f\n" \
             "beq 5f\n" \
-            "bkpt 0xE1\n" \
             "5:\n" \
             "cmp r0, #1\n" \
             "bne 1f\n" \
@@ -718,6 +726,10 @@ static void __attribute__((noinline)) wolfBoot_image_clear_signature_ok(
             "b 2f\n" \
             "3:\n" \
             "b .\n" \
+            "b .\n" \
+            "b .\n" \
+            "b .\n" \
+            "b .\n" \
             "2:\n" \
             "pop {r4, r5, r6, r7}\n" \
             : /* No output operands */ \

src/update_flash.c

@@ -687,7 +687,7 @@ static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
 #endif
     int fallback_image = 0;
 #ifndef DISABLE_BACKUP
-    int rollback = 0;
+    int rollback_needed = 0;
     int bootStateRet = -1;
     uint8_t bootState = 0;
 #endif
@@ -757,7 +757,7 @@ static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
     bootStateRet = wolfBoot_get_partition_state(PART_BOOT, &bootState);
     if ((bootStateRet == 0) && (bootState == IMG_STATE_TESTING) &&
         (fallback_allowed != 0) && (cur_ver >= upd_ver)) {
-        rollback = 1;
+        rollback_needed = 1;
     }
 #endif
 
@@ -987,7 +987,7 @@ static int RAMFUNCTION wolfBoot_update(int fallback_allowed)
      * wolfBoot_start */
     wolfBoot_swap_and_final_erase(0);
 #ifndef DISABLE_BACKUP
-    if (rollback) {
+    if (rollback_needed) {
         hal_flash_unlock();
 #ifdef EXT_FLASH
         ext_flash_unlock();