mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-11-29 14:41:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

spl: Add a parameter to jump_to_image_linux()

Browse Source 
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>
This commit is contained in:
Simon Glass 2016-09-24 18:19:54 -06:00 committed by Tom Rini
parent 71316c1d8c
commit ca12e65caa
5 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/lib/spl.c
View File

@ -47,7 +47,7 @@ void __weak board_init_f(ulong dummy)
* arg: Pointer to paramter image in RAM * arg: Pointer to paramter image in RAM
*/ */
#ifdef CONFIG_SPL_OS_BOOT #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; unsigned long machid = 0xffffffff;
#ifdef CONFIG_MACH_TYPE #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 *) typedef void (*image_entry_arg_t)(int, int, void *)
__attribute__ ((noreturn)); __attribute__ ((noreturn));
image_entry_arg_t image_entry = 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(); cleanup_before_linux();
image_entry(0, machid, arg); image_entry(0, machid, arg);
} }

4
arch/microblaze/cpu/spl.c
View File

@ -29,13 +29,13 @@ void spl_board_init(void)
} }
#ifdef CONFIG_SPL_OS_BOOT #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); debug("Entering kernel arg pointer: 0x%p\n", arg);
typedef void (*image_entry_arg_t)(char *, ulong, ulong) typedef void (*image_entry_arg_t)(char *, ulong, ulong)
__attribute__ ((noreturn)); __attribute__ ((noreturn));
image_entry_arg_t image_entry = 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); image_entry(NULL, 0, (ulong)arg);
} }

4
arch/powerpc/lib/spl.c
View File

@ -17,14 +17,14 @@ DECLARE_GLOBAL_DATA_PTR;
* arg: Pointer to paramter image in RAM * arg: Pointer to paramter image in RAM
*/ */
#ifdef CONFIG_SPL_OS_BOOT #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); debug("Entering kernel arg pointer: 0x%p\n", arg);
typedef void (*image_entry_arg_t)(void *, ulong r4, ulong r5, ulong r6, typedef void (*image_entry_arg_t)(void *, ulong r4, ulong r5, ulong r6,
ulong r7, ulong r8, ulong r9) ulong r7, ulong r8, ulong r9)
__attribute__ ((noreturn)); __attribute__ ((noreturn));
image_entry_arg_t image_entry = 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); image_entry(arg, 0, 0, EPAPR_MAGIC, CONFIG_SYS_BOOTMAPSZ, 0, 0);
} }

3
common/spl/spl.c
View File

@ -474,7 +474,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
case IH_OS_LINUX: case IH_OS_LINUX:
debug("Jumping to Linux\n"); debug("Jumping to Linux\n");
spl_board_prepare_for_linux(); 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 #endif
default: default:
debug("Unsupported OS image.. Jumping nevertheless..\n"); debug("Unsupported OS image.. Jumping nevertheless..\n");

12
include/spl.h
View File

@ -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_linux(void);
void spl_board_prepare_for_boot(void); void spl_board_prepare_for_boot(void);
int spl_board_ubi_load_image(u32 boot_device); 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); int spl_start_uboot(void);
void spl_display_print(void); void spl_display_print(void);