Boot: Remove unnecessary preprocessor directives
Remove unnecessary preprocessor directives to merge the separate, but
logically matching conditionally compiled code blocks into one, without
rearranging the function definitions (which would make the later code
synchronizations harder).
Change-Id: I0867a65ea96431c8883a3e75663238079394a83d
Signed-off-by: David Vincze <david.vincze@arm.com>
diff --git a/bl2/ext/mcuboot/bootutil/src/loader.c b/bl2/ext/mcuboot/bootutil/src/loader.c
index 4a08b24..a3301cf 100644
--- a/bl2/ext/mcuboot/bootutil/src/loader.c
+++ b/bl2/ext/mcuboot/bootutil/src/loader.c
@@ -1202,7 +1202,6 @@
return rc;
}
-#endif /* !MCUBOOT_OVERWRITE_ONLY */
/**
* Swaps the contents of two flash regions within the two image slots.
@@ -1215,7 +1214,6 @@
*
* @return 0 on success; nonzero on failure.
*/
-#ifndef MCUBOOT_OVERWRITE_ONLY
static void
boot_swap_sectors(int idx, uint32_t sz, struct boot_loader_state *state,
struct boot_status *bs)
@@ -1613,10 +1611,10 @@
}
#endif
+#ifndef MCUBOOT_OVERWRITE_ONLY
/**
* Marks the image in the primary slot as fully copied.
*/
-#ifndef MCUBOOT_OVERWRITE_ONLY
static int
boot_set_copy_done(uint8_t image_index)
{
@@ -1633,7 +1631,6 @@
flash_area_close(fap);
return rc;
}
-#endif /* !MCUBOOT_OVERWRITE_ONLY */
/**
* Marks a reverted image in the primary slot as confirmed. This is necessary to
@@ -1644,7 +1641,6 @@
* image installed on the primary slot and the new image to be upgrade to has a
* bad sig, image_ok would be overwritten.
*/
-#ifndef MCUBOOT_OVERWRITE_ONLY
static int
boot_set_image_ok(uint8_t image_index)
{