This is about to become a misnomer since with standard passage we need to pass arguments to U-Boot. Rename the function.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v2: - Split the jump_to_image_no_args() change into its own patch
arch/arm/mach-imx/imx8ulp/soc.c | 2 +- arch/arm/mach-imx/spl.c | 2 +- arch/arm/mach-k3/common.c | 2 +- arch/arm/mach-omap2/boot-common.c | 2 +- arch/arm/mach-tegra/spl.c | 2 +- arch/mips/lib/spl.c | 2 +- arch/riscv/lib/spl.c | 2 +- arch/sandbox/cpu/spl.c | 4 ++-- arch/x86/lib/spl.c | 2 +- arch/x86/lib/tpl.c | 2 +- board/freescale/common/fsl_chain_of_trust.c | 2 +- board/renesas/rcar-common/gen3-spl.c | 2 +- common/spl/spl.c | 4 ++-- drivers/usb/gadget/f_sdp.c | 2 +- include/spl.h | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/arch/arm/mach-imx/imx8ulp/soc.c b/arch/arm/mach-imx/imx8ulp/soc.c index bba6323f96f..ad2ee880f53 100644 --- a/arch/arm/mach-imx/imx8ulp/soc.c +++ b/arch/arm/mach-imx/imx8ulp/soc.c @@ -512,7 +512,7 @@ int arch_cpu_init_dm(void) }
#if defined(CONFIG_SPL_BUILD) -__weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) +__weak void __noreturn jump_to_image(struct spl_image_info *spl_image) { debug("image entry point: 0x%lx\n", spl_image->entry_point);
diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c index 427b7f78599..1055b126e39 100644 --- a/arch/arm/mach-imx/spl.c +++ b/arch/arm/mach-imx/spl.c @@ -279,7 +279,7 @@ u32 spl_mmc_boot_mode(const u32 boot_device) * +------------+ + CSF_PAD_SIZE */
-__weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) +__weak void __noreturn jump_to_image(struct spl_image_info *spl_image) { typedef void __noreturn (*image_entry_noargs_t)(void); uint32_t offset; diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index 2666cd2d7b1..aba554e262a 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -198,7 +198,7 @@ __weak void release_resources_for_core_shutdown(void) debug("%s not implemented...\n", __func__); }
-void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) +void __noreturn jump_to_image(struct spl_image_info *spl_image) { typedef void __noreturn (*image_entry_noargs_t)(void); struct ti_sci_handle *ti_sci = get_ti_sci_handle(); diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index fdb8b479ea0..ee7d1240dbf 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -216,7 +216,7 @@ void spl_board_init(void) #endif }
-void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) +void __noreturn jump_to_image(struct spl_image_info *spl_image) { typedef void __noreturn (*image_entry_noargs_t)(u32 *); image_entry_noargs_t image_entry = diff --git a/arch/arm/mach-tegra/spl.c b/arch/arm/mach-tegra/spl.c index ed897efc5f0..1e4efa325ee 100644 --- a/arch/arm/mach-tegra/spl.c +++ b/arch/arm/mach-tegra/spl.c @@ -44,7 +44,7 @@ u32 spl_boot_device(void) return BOOT_DEVICE_RAM; }
-void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) +void __noreturn jump_to_image(struct spl_image_info *spl_image) { debug("image entry point: 0x%lX\n", spl_image->entry_point);
diff --git a/arch/mips/lib/spl.c b/arch/mips/lib/spl.c index f96fda5b2de..e07cd398d02 100644 --- a/arch/mips/lib/spl.c +++ b/arch/mips/lib/spl.c @@ -8,7 +8,7 @@ #include <log.h> #include <spl.h>
-void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) +void __noreturn jump_to_image(struct spl_image_info *spl_image) { typedef void __noreturn (*image_entry_noargs_t)(void); image_entry_noargs_t image_entry = diff --git a/arch/riscv/lib/spl.c b/arch/riscv/lib/spl.c index 8baee07beac..c8238ecbeb0 100644 --- a/arch/riscv/lib/spl.c +++ b/arch/riscv/lib/spl.c @@ -36,7 +36,7 @@ __weak void board_init_f(ulong dummy) panic("spl_board_init_f() failed: %d\n", ret); }
-void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) +void __noreturn jump_to_image(struct spl_image_info *spl_image) { typedef void __noreturn (*image_entry_riscv_t)(ulong hart, void *dtb); void *fdt_blob; diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c index 650bdb0a701..22df543e6b7 100644 --- a/arch/sandbox/cpu/spl.c +++ b/arch/sandbox/cpu/spl.c @@ -58,7 +58,7 @@ static int spl_board_load_image(struct spl_image_info *spl_image, }
/* - * Set up spl_image to boot from jump_to_image_no_args(). Allocate this + * Set up spl_image to boot from jump_to_image(). Allocate this * outsdide the RAM buffer (i.e. don't use strdup()). */ spl_image->arg = os_malloc(strlen(fname) + 1); @@ -87,7 +87,7 @@ void spl_board_init(void) } }
-void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) +void __noreturn jump_to_image(struct spl_image_info *spl_image) { const char *fname = spl_image->arg;
diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c index b18c1cd6092..c51514bfeb8 100644 --- a/arch/x86/lib/spl.c +++ b/arch/x86/lib/spl.c @@ -238,7 +238,7 @@ int spl_spi_load_image(void) }
#ifdef CONFIG_X86_RUN_64BIT -void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) +void __noreturn jump_to_image(struct spl_image_info *spl_image) { int ret;
diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c index 5b57e53c2dd..b334f70e83e 100644 --- a/arch/x86/lib/tpl.c +++ b/arch/x86/lib/tpl.c @@ -110,7 +110,7 @@ int spl_spi_load_image(void) return -EPERM; }
-void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) +void __noreturn jump_to_image(struct spl_image_info *spl_image) { debug("Jumping to %s at %lx\n", spl_phase_name(spl_next_phase()), (ulong)spl_image->entry_point); diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c index cafb24971b2..ab0ace88487 100644 --- a/board/freescale/common/fsl_chain_of_trust.c +++ b/board/freescale/common/fsl_chain_of_trust.c @@ -140,7 +140,7 @@ void spl_validate_uboot(uint32_t hdr_addr, uintptr_t img_addr) /* Override weak funtion defined in SPL framework to enable validation * of main u-boot image before jumping to u-boot image. */ -void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) +void __noreturn jump_to_image(struct spl_image_info *spl_image) { typedef void __noreturn (*image_entry_noargs_t)(void); uint32_t hdr_addr; diff --git a/board/renesas/rcar-common/gen3-spl.c b/board/renesas/rcar-common/gen3-spl.c index b02a946a21d..de8f9a423de 100644 --- a/board/renesas/rcar-common/gen3-spl.c +++ b/board/renesas/rcar-common/gen3-spl.c @@ -34,7 +34,7 @@ u32 spl_boot_device(void) return BOOT_DEVICE_UART; }
-void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) +void __noreturn jump_to_image(struct spl_image_info *spl_image) { debug("image entry point: 0x%lx\n", spl_image->entry_point); if (spl_image->os == IH_OS_ARM_TRUSTED_FIRMWARE) { diff --git a/common/spl/spl.c b/common/spl/spl.c index 932ad53614d..d54356b6a28 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -385,7 +385,7 @@ int spl_parse_image_header(struct spl_image_info *spl_image, return 0; }
-__weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) +__weak void __noreturn jump_to_image(struct spl_image_info *spl_image) { typedef void __noreturn (*image_entry_noargs_t)(void);
@@ -820,7 +820,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2) #endif
spl_board_prepare_for_boot(); - jump_to_image_no_args(&spl_image); + jump_to_image(&spl_image); }
/* diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c index e48aa2f90df..500a8c8f8bd 100644 --- a/drivers/usb/gadget/f_sdp.c +++ b/drivers/usb/gadget/f_sdp.c @@ -863,7 +863,7 @@ static int sdp_handle_in_ep(struct spl_image_info *spl_image) /* In SPL, allow jumps to U-Boot images */ struct spl_image_info spl_image = {}; spl_parse_image_header(&spl_image, header); - jump_to_image_no_args(&spl_image); + jump_to_image(&spl_image); #else /* In U-Boot, allow jumps to scripts */ image_source_script(sdp_func->jmp_address, "script@1"); diff --git a/include/spl.h b/include/spl.h index 0af0ee30034..a4d5cedad3a 100644 --- a/include/spl.h +++ b/include/spl.h @@ -579,7 +579,7 @@ int spl_load_image_fat(struct spl_image_info *spl_image, int spl_load_image_fat_os(struct spl_image_info *spl_image, struct blk_desc *block_dev, int partition);
-void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image); +void __noreturn jump_to_image(struct spl_image_info *spl_image);
/* SPL EXT image functions */ int spl_load_image_ext(struct spl_image_info *spl_image,