diff options
| author | Simon Glass <[email protected]> | 2016-09-24 18:19:57 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2016-10-06 14:53:36 -0400 |
| commit | ecdfd69a4be55363589e8185ff151b02e6c36cfa (patch) | |
| tree | b625ae78bfe96236f62320061a1a667f4d8e446d /arch | |
| parent | a807ab33035fe2e9b63aac2e7475525ca8d90adc (diff) | |
spl: Convert boot_device into a struct
At present some spl_xxx_load_image() functions take a parameter and some
don't. Of those that do, most take an integer but one takes a string.
Convert this parameter into a struct so that we can pass all functions the
same thing. This will allow us to use a common function signature.
Signed-off-by: Simon Glass <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-sunxi/board.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-uniphier/boot-mode/spl_board.c | 2 | ||||
| -rw-r--r-- | arch/sandbox/cpu/spl.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 6d9518d4c60..8a385a25fdf 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -133,7 +133,7 @@ static int gpio_init(void) return 0; } -int spl_board_load_image(void) +int spl_board_load_image(struct spl_boot_device *bootdev) { debug("Returning to FEL sp=%x, lr=%x\n", fel_stash.sp, fel_stash.lr); return_to_fel(fel_stash.sp, fel_stash.lr); diff --git a/arch/arm/mach-uniphier/boot-mode/spl_board.c b/arch/arm/mach-uniphier/boot-mode/spl_board.c index 63ab41ce1b3..4eadc2f26a7 100644 --- a/arch/arm/mach-uniphier/boot-mode/spl_board.c +++ b/arch/arm/mach-uniphier/boot-mode/spl_board.c @@ -65,7 +65,7 @@ int uniphier_rom_get_mmc_funcptr(int (**send_cmd)(u32, u32), return 0; } -int spl_board_load_image(void) +int spl_board_load_image(struct spl_boot_device *bootdev) { int (*send_cmd)(u32 cmd, u32 arg); int (*card_blockaddr)(u32 rca); diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c index e8349c0b932..4cee293f76a 100644 --- a/arch/sandbox/cpu/spl.c +++ b/arch/sandbox/cpu/spl.c @@ -38,7 +38,7 @@ void spl_board_announce_boot_device(void) printf("%s\n", fname); } -int spl_board_load_image(void) +int spl_board_load_image(struct spl_boot_device *bootdev) { char fname[256]; int ret; |