bootutil: Move duplicate static inline functions to one header
The commit moves static common functions that have duplicate
definitions in bootutil_public.c and bootutil_misc.c to header
file to be included by both files.
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 c567892..e26cc09 100644
--- a/boot/bootutil/src/bootutil_public.c
+++ b/boot/bootutil/src/bootutil_public.c
@@ -49,6 +49,7 @@
#include "bootutil/boot_public_hooks.h"
#include "bootutil_priv.h"
+#include "bootutil_misc.h"
#ifdef CONFIG_MCUBOOT
BOOT_LOG_MODULE_DECLARE(mcuboot);
@@ -129,15 +130,6 @@
(sizeof boot_swap_tables / sizeof boot_swap_tables[0])
static int
-boot_magic_decode(const uint8_t *magic)
-{
- if (memcmp(magic, BOOT_IMG_MAGIC, BOOT_MAGIC_SZ) == 0) {
- return BOOT_MAGIC_GOOD;
- }
- return BOOT_MAGIC_BAD;
-}
-
-static int
boot_flag_decode(uint8_t flag)
{
if (flag != BOOT_FLAG_SET) {
@@ -146,24 +138,6 @@
return BOOT_FLAG_SET;
}
-static inline uint32_t
-boot_magic_off(const struct flash_area *fap)
-{
- return flash_area_get_size(fap) - BOOT_MAGIC_SZ;
-}
-
-static inline uint32_t
-boot_image_ok_off(const struct flash_area *fap)
-{
- return ALIGN_DOWN(boot_magic_off(fap) - BOOT_MAX_ALIGN, BOOT_MAX_ALIGN);
-}
-
-static inline uint32_t
-boot_copy_done_off(const struct flash_area *fap)
-{
- return boot_image_ok_off(fap) - BOOT_MAX_ALIGN;
-}
-
uint32_t
boot_swap_info_off(const struct flash_area *fap)
{