This function will be used by the relocating jumper too, so add a typedef to the header file to avoid mismatches.
Signed-off-by: Simon Glass sjg@chromium.org ---
common/spl/spl.c | 3 +-- include/spl.h | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/common/spl/spl.c b/common/spl/spl.c index 75938aa63cc..52f7900b431 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -672,8 +672,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) BOOT_DEVICE_NONE, BOOT_DEVICE_NONE, }; - typedef void __noreturn (*jump_to_image_t)(struct spl_image_info *); - jump_to_image_t jump_to_image = &jump_to_image_no_args; + spl_jump_to_image_t jump_to_image = &jump_to_image_no_args; struct spl_image_info spl_image; int ret, os;
diff --git a/include/spl.h b/include/spl.h index 113d50152a1..f73e5f5209c 100644 --- a/include/spl.h +++ b/include/spl.h @@ -274,6 +274,9 @@ struct spl_image_info { #endif };
+/* function to jump to an image from SPL */ +typedef void __noreturn (*spl_jump_to_image_t)(struct spl_image_info *); + static inline void *spl_image_fdt_addr(struct spl_image_info *info) { #if CONFIG_IS_ENABLED(LOAD_FIT) || CONFIG_IS_ENABLED(LOAD_FIT_FULL)