commit b304075ceccdc825e5ee477c154f61b667c31e9d
author Simon Glass <sjg@chromium.org> Wed May 28 06:32:08 2025 -0600
committer Tom Rini <trini@konsulko.com> Fri Jun 13 13:22:53 2025 -0600
tree 4cf69a4b315d9120683223723dd9bd0d0f53187f
parent 7f18cdd61b7ef833f177959d30d96c5396c0d907

spl: Rename jump_to_image_no_args()

This function is currently a misnomer at times as we have cases where it
passes arguments to the image. In preparation for making that be a more
common case rename this function to jump_to_image(...). In order to do
this, rename jump_to_image in board_init_r(...) to jumper so that we do
not have a conflict.

Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Reword the commit message, adding missing cases of
        jump_to_image_no_args()]
Signed-off-by: Tom Rini <trini@konsulko.com>

arch/x86/lib/spl.c

diff --git a/arch/x86/lib/spl.c b/arch/x86/lib/spl.c
index 6a6cad3..01ff034 100644
--- a/arch/x86/lib/spl.c
+++ b/arch/x86/lib/spl.c
@@ -277,7 +277,7 @@
 }
 
 #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;
 

arch/x86/lib/tpl.c

diff --git a/arch/x86/lib/tpl.c b/arch/x86/lib/tpl.c
index f7df7e0..06c9e4d 100644
--- a/arch/x86/lib/tpl.c
+++ b/arch/x86/lib/tpl.c
@@ -101,7 +101,7 @@
 	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", xpl_name(xpl_next_phase()),
 	      (ulong)spl_image->entry_point);