bootutil: Move flash_area_id_to_image under ifdef
The commit moves the flash_area_id_to_image to section compiled
only when not in DirectXIP mode, to prevent warnings about unused
static functions.
Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
diff --git a/boot/bootutil/src/bootutil_public.c b/boot/bootutil/src/bootutil_public.c
index 1a50c82..2795415 100644
--- a/boot/bootutil/src/bootutil_public.c
+++ b/boot/bootutil/src/bootutil_public.c
@@ -458,6 +458,20 @@
return BOOT_SWAP_TYPE_NONE;
}
+int
+boot_write_copy_done(const struct flash_area *fap)
+{
+ uint32_t off;
+
+ off = boot_copy_done_off(fap);
+ BOOT_LOG_DBG("writing copy_done; fa_id=%d off=0x%lx (0x%lx)",
+ flash_area_get_id(fap), (unsigned long)off,
+ (unsigned long)(flash_area_get_off(fap) + off));
+ return boot_write_trailer_flag(fap, off, BOOT_FLAG_SET);
+}
+
+#ifndef MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP
+
static int flash_area_id_to_image(int id)
{
#if BOOT_IMAGE_NUMBER > 1
@@ -477,20 +491,6 @@
}
int
-boot_write_copy_done(const struct flash_area *fap)
-{
- uint32_t off;
-
- off = boot_copy_done_off(fap);
- BOOT_LOG_DBG("writing copy_done; fa_id=%d off=0x%lx (0x%lx)",
- flash_area_get_id(fap), (unsigned long)off,
- (unsigned long)(flash_area_get_off(fap) + off));
- return boot_write_trailer_flag(fap, off, BOOT_FLAG_SET);
-}
-
-
-#ifndef MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP
-int
boot_set_next(const struct flash_area *fa, bool active, bool confirm)
{
struct boot_swap_state slot_state;