Unify the hdr_cpy (we don't need two)

dgarske · dgarske · commit e9ce67a4b910 · 2025-11-14T16:48:04.000-08:00
diff --git a/src/image.c b/src/image.c
@@ -875,8 +875,14 @@ static uint8_t *get_sha_block(struct wolfBoot_image *img, uint32_t offset)
 }
 
 #ifdef EXT_FLASH
+#ifdef UNIT_TEST
 static uint8_t hdr_cpy[IMAGE_HEADER_SIZE] XALIGNED(4);
 static int hdr_cpy_done = 0;
+#else
+/* use from libwolfboot.c */
+extern uint8_t hdr_cpy[IMAGE_HEADER_SIZE] XALIGNED(4);
+extern int hdr_cpy_done;
+#endif
 
 /**
  * @brief Get a copy of the image header.
diff --git a/src/libwolfboot.c b/src/libwolfboot.c
@@ -904,8 +904,8 @@ uint16_t wolfBoot_find_header(uint8_t *haystack, uint16_t type, uint8_t **ptr)
 }
 
 #ifdef EXT_FLASH
-static uint8_t hdr_cpy[IMAGE_HEADER_SIZE] XALIGNED(4);
-static uint32_t hdr_cpy_done = 0;
+uint8_t hdr_cpy[IMAGE_HEADER_SIZE] XALIGNED(4);
+uint32_t hdr_cpy_done = 0;
 #endif
 
 /**
@@ -949,6 +949,10 @@ static inline uint16_t im2ns(uint16_t val)
 }
 
 #ifdef DELTA_UPDATES
+
+/* forward declaration */
+static uint8_t* wolfBoot_get_image_from_part(uint8_t part);
+
 /**
  * @brief Get delta update information.
  *

Original file line number	Diff line number	Diff line change
`@@ -904,8 +904,8 @@ uint16_t wolfBoot_find_header(uint8_t haystack, uint16_t type, uint8_t *ptr)`
`904`	`904`	`}`
`905`	`905`
`906`	`906`	`#ifdef EXT_FLASH`
`907`		`-static uint8_t hdr_cpy[IMAGE_HEADER_SIZE] XALIGNED(4);`
`908`		`-static uint32_t hdr_cpy_done = 0;`
	`907`	`+uint8_t hdr_cpy[IMAGE_HEADER_SIZE] XALIGNED(4);`
	`908`	`+uint32_t hdr_cpy_done = 0;`
`909`	`909`	`#endif`
`910`	`910`
`911`	`911`	`/**`
`@@ -949,6 +949,10 @@ static inline uint16_t im2ns(uint16_t val)`
`949`	`949`	`}`
`950`	`950`
`951`	`951`	`#ifdef DELTA_UPDATES`
	`952`	`+`
	`953`	`+/* forward declaration */`
	`954`	`+static uint8_t* wolfBoot_get_image_from_part(uint8_t part);`
	`955`	`+`
`952`	`956`	`/**`
`953`	`957`	`* @brief Get delta update information.`
`954`	`958`	`*`