commit a32f1af386fc15f0e2f629f511d59248efcd45f6
author Fabio Utzig <utzig@apache.org> Mon Jan 07 06:50:58 2019 -0200
committer Fabio Utzig <utzig@utzig.org> Mon Jan 07 10:59:20 2019 -0200
tree 5c43d74c46ea04a67ec53a8d62192e8d59f029bf
parent 4b2591285afd7eb7c4f9a951548820fdf96464f6

Fix overwrite-only under Zephyr

As reported by issue #384, some #ifdefery was wrongly done, which broke
overwrite-only mode under Zephyr.

Signed-off-by: Fabio Utzig <utzig@apache.org>

boot/bootutil/src/loader.c

diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index 1711ae9..f6f9d92 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -1523,7 +1523,7 @@
 
     /* If a partial swap was detected, complete it. */
     if (bs.idx != BOOT_STATUS_IDX_0 || bs.state != BOOT_STATUS_STATE_0) {
-#if MCUBOOT_OVERWRITE_ONLY
+#ifdef MCUBOOT_OVERWRITE_ONLY
         /* Should never arrive here, overwrite-only mode has no swap state. */
         assert(0);
 #else
@@ -1547,7 +1547,7 @@
         case BOOT_SWAP_TYPE_TEST:
         case BOOT_SWAP_TYPE_PERM:
         case BOOT_SWAP_TYPE_REVERT:
-#if MCUBOOT_OVERWRITE_ONLY
+#ifdef MCUBOOT_OVERWRITE_ONLY
             rc = boot_copy_image(&bs);
 #else
             rc = boot_swap_image(&bs);