zephyr: firmware/single_loader: Fix compile warning

nordicjm · nordicjm · commit 212997395ed3 · 2023-12-07T10:43:58.000Z
Fixes an issue of an unused function calling an undefined function

Signed-off-by: Jamie McCrae &lt;jamie.mccrae@nordicsemi.no&gt;
diff --git a/boot/zephyr/firmware_loader.c b/boot/zephyr/firmware_loader.c
@@ -62,6 +62,7 @@ boot_image_validate(const struct flash_area *fa_p,
 }
 #endif /* MCUBOOT_VALIDATE_PRIMARY_SLOT || MCUBOOT_VALIDATE_PRIMARY_SLOT_ONCE*/
 
+#if defined(MCUBOOT_VALIDATE_PRIMARY_SLOT_ONCE)
 inline static fih_ret
 boot_image_validate_once(const struct flash_area *fa_p,
                     struct image_header *hdr)
@@ -92,6 +93,7 @@ boot_image_validate_once(const struct flash_area *fa_p,
     }
     FIH_RET(FIH_SUCCESS);
 }
+#endif
 
 /**
  * Validates that an image in a slot is OK to boot.
diff --git a/boot/zephyr/single_loader.c b/boot/zephyr/single_loader.c
@@ -58,6 +58,7 @@ boot_image_validate(const struct flash_area *fa_p,
 }
 #endif /* MCUBOOT_VALIDATE_PRIMARY_SLOT || MCUBOOT_VALIDATE_PRIMARY_SLOT_ONCE*/
 
+#if defined(MCUBOOT_VALIDATE_PRIMARY_SLOT_ONCE)
 inline static fih_ret
 boot_image_validate_once(const struct flash_area *fa_p,
                     struct image_header *hdr)
@@ -88,6 +89,7 @@ boot_image_validate_once(const struct flash_area *fa_p,
     }
     FIH_RET(FIH_SUCCESS);
 }
+#endif
 
 /**
  * Gather information on image and prepare for booting.

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ boot_image_validate(const struct flash_area *fa_p,`
`62`	`62`	`}`
`63`	`63`	`#endif /* MCUBOOT_VALIDATE_PRIMARY_SLOT \|\| MCUBOOT_VALIDATE_PRIMARY_SLOT_ONCE*/`
`64`	`64`
	`65`	`+#if defined(MCUBOOT_VALIDATE_PRIMARY_SLOT_ONCE)`
`65`	`66`	`inline static fih_ret`
`66`	`67`	`boot_image_validate_once(const struct flash_area *fa_p,`
`67`	`68`	`struct image_header *hdr)`
`@@ -92,6 +93,7 @@ boot_image_validate_once(const struct flash_area *fa_p,`
`92`	`93`	`}`
`93`	`94`	`FIH_RET(FIH_SUCCESS);`
`94`	`95`	`}`
	`96`	`+#endif`
`95`	`97`
`96`	`98`	`/**`
`97`	`99`	`* Validates that an image in a slot is OK to boot.`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ boot_image_validate(const struct flash_area *fa_p,`
`58`	`58`	`}`
`59`	`59`	`#endif /* MCUBOOT_VALIDATE_PRIMARY_SLOT \|\| MCUBOOT_VALIDATE_PRIMARY_SLOT_ONCE*/`
`60`	`60`
	`61`	`+#if defined(MCUBOOT_VALIDATE_PRIMARY_SLOT_ONCE)`
`61`	`62`	`inline static fih_ret`
`62`	`63`	`boot_image_validate_once(const struct flash_area *fa_p,`
`63`	`64`	`struct image_header *hdr)`
`@@ -88,6 +89,7 @@ boot_image_validate_once(const struct flash_area *fa_p,`
`88`	`89`	`}`
`89`	`90`	`FIH_RET(FIH_SUCCESS);`
`90`	`91`	`}`
	`92`	`+#endif`
`91`	`93`
`92`	`94`	`/**`
`93`	`95`	`* Gather information on image and prepare for booting.`