spl: Add a parameter to jump_to_image_linux()

Instead of using the global spl_image variable, pass the required struct in
as an argument.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c
index 3587ad681297e980ed65fca650314c09474c5b20..e606d470e3809b5e8f4b529a24bd25621f096602 100644 (file)
--- a/arch/arm/lib/spl.c
+++ b/arch/arm/lib/spl.c
@@ -47,7 +47,7 @@ void __weak board_init_f(ulong dummy)
  * arg: Pointer to paramter image in RAM
  */
 #ifdef CONFIG_SPL_OS_BOOT
-void __noreturn jump_to_image_linux(void *arg)
+void __noreturn jump_to_image_linux(struct spl_image_info *spl_image, void *arg)
 {
        unsigned long machid = 0xffffffff;
 #ifdef CONFIG_MACH_TYPE
@@ -58,7 +58,7 @@ void __noreturn jump_to_image_linux(void *arg)
        typedef void (*image_entry_arg_t)(int, int, void *)
                __attribute__ ((noreturn));
        image_entry_arg_t image_entry =
-               (image_entry_arg_t)(uintptr_t) spl_image.entry_point;
+               (image_entry_arg_t)(uintptr_t) spl_image->entry_point;
        cleanup_before_linux();
        image_entry(0, machid, arg);
 }

diff --git a/arch/microblaze/cpu/spl.c b/arch/microblaze/cpu/spl.c
index f4bb0915c594f23690b644399d9a626db3245820..8e6d9269dac9d8f741792c042543c17d51e950c9 100644 (file)
--- a/arch/microblaze/cpu/spl.c
+++ b/arch/microblaze/cpu/spl.c
@@ -29,13 +29,13 @@ void spl_board_init(void)
 }
 
 #ifdef CONFIG_SPL_OS_BOOT
-void __noreturn jump_to_image_linux(void *arg)
+void __noreturn jump_to_image_linux(struct spl_image_info *spl_image, void *arg)
 {
        debug("Entering kernel arg pointer: 0x%p\n", arg);
        typedef void (*image_entry_arg_t)(char *, ulong, ulong)
                __attribute__ ((noreturn));
        image_entry_arg_t image_entry =
-               (image_entry_arg_t)spl_image.entry_point;
+               (image_entry_arg_t)spl_image->entry_point;
 
        image_entry(NULL, 0, (ulong)arg);
 }

diff --git a/arch/powerpc/lib/spl.c b/arch/powerpc/lib/spl.c
index 0e486ccebfa72063830ebd3e97b836fa1f94a2b5..080b978799bcaa3e1ac7ec41d1c862934ab9eb5d 100644 (file)
--- a/arch/powerpc/lib/spl.c
+++ b/arch/powerpc/lib/spl.c
@@ -17,14 +17,14 @@ DECLARE_GLOBAL_DATA_PTR;
  * arg: Pointer to paramter image in RAM
  */
 #ifdef CONFIG_SPL_OS_BOOT
-void __noreturn jump_to_image_linux(void *arg)
+void __noreturn jump_to_image_linux(struct spl_image_info *spl_image, void *arg)
 {
        debug("Entering kernel arg pointer: 0x%p\n", arg);
        typedef void (*image_entry_arg_t)(void *, ulong r4, ulong r5, ulong r6,
                                          ulong r7, ulong r8, ulong r9)
                __attribute__ ((noreturn));
        image_entry_arg_t image_entry =
-               (image_entry_arg_t)spl_image.entry_point;
+               (image_entry_arg_t)spl_image->entry_point;
 
        image_entry(arg, 0, 0, EPAPR_MAGIC, CONFIG_SYS_BOOTMAPSZ, 0, 0);
 }

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 7f67d41e49c8784867f87b57d68584cfed7856ef..6d071312bc50a4ed35e6cdbb886fa1099b7db1a3 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -474,7 +474,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
        case IH_OS_LINUX:
                debug("Jumping to Linux\n");
                spl_board_prepare_for_linux();
-               jump_to_image_linux((void *)CONFIG_SYS_SPL_ARGS_ADDR);
+               jump_to_image_linux(&spl_image,
+                                   (void *)CONFIG_SYS_SPL_ARGS_ADDR);
 #endif
        default:
                debug("Unsupported OS image.. Jumping nevertheless..\n");

diff --git a/include/spl.h b/include/spl.h
index 1770fd88600930e2e6b552a01456ca7284043551..7fba485fea5fd2060fb01d0ccd93c1d1cc04fa7f 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -99,7 +99,17 @@ int spl_parse_image_header(struct spl_image_info *spl_image,
 void spl_board_prepare_for_linux(void);
 void spl_board_prepare_for_boot(void);
 int spl_board_ubi_load_image(u32 boot_device);
-void __noreturn jump_to_image_linux(void *arg);
+
+/**
+ * jump_to_image_linux() - Jump to a Linux kernel from SPL
+ *
+ * This jumps into a Linux kernel using the information in @spl_image.
+ *
+ * @spl_image: Image description to set up
+ * @arg: Argument to pass to Linux (typically a device tree pointer)
+ */
+void __noreturn jump_to_image_linux(struct spl_image_info *spl_image,
+                                   void *arg);
 int spl_start_uboot(void);
 void spl_display_print(void);