Add a linker list declaration for this method and remove the explicit switch() code. Update existing users.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v2: None
arch/arm/mach-sunxi/board.c | 5 ++++- arch/arm/mach-uniphier/boot-mode/spl_board.c | 3 ++- arch/sandbox/cpu/spl.c | 3 ++- common/spl/spl.c | 13 ++----------- include/spl.h | 8 -------- 5 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 8a385a2..22f3e3c 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -133,13 +133,16 @@ static int gpio_init(void) return 0; }
-int spl_board_load_image(struct spl_boot_device *bootdev) +#ifdef CONFIG_SPL_BUILD +static 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);
return 0; } +SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_BOARD, spl_board_load_image); +#endif
void s_init(void) { diff --git a/arch/arm/mach-uniphier/boot-mode/spl_board.c b/arch/arm/mach-uniphier/boot-mode/spl_board.c index 4eadc2f..e2b202e 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(struct spl_boot_device *bootdev) +static int spl_board_load_image(struct spl_boot_device *bootdev) { int (*send_cmd)(u32 cmd, u32 arg); int (*card_blockaddr)(u32 rca); @@ -126,3 +126,4 @@ int spl_board_load_image(struct spl_boot_device *bootdev)
return 0; } +SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_BOARD, spl_board_load_image); diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c index 4cee293..2c45354 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(struct spl_boot_device *bootdev) +static int spl_board_load_image(struct spl_boot_device *bootdev) { char fname[256]; int ret; @@ -50,6 +50,7 @@ int spl_board_load_image(struct spl_boot_device *bootdev) /* Hopefully this will not return */ return os_spl_to_uboot(fname); } +SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_BOARD, spl_board_load_image);
void spl_board_init(void) { diff --git a/common/spl/spl.c b/common/spl/spl.c index 06a326d..a5719f2 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -372,19 +372,10 @@ static int spl_load_image(u32 boot_device) if (loader) return loader->load_image(&bootdev);
- switch (boot_device) { -#ifdef CONFIG_SPL_BOARD_LOAD_IMAGE - case BOOT_DEVICE_BOARD: - return spl_board_load_image(&bootdev); -#endif - default: #if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT) - puts("SPL: Unsupported Boot Device!\n"); + puts("SPL: Unsupported Boot Device!\n"); #endif - return -ENODEV; - } - - return -EINVAL; + return -ENODEV; }
void board_init_r(gd_t *dummy1, ulong dummy2) diff --git a/include/spl.h b/include/spl.h index 24a6ec4..cfab92b 100644 --- a/include/spl.h +++ b/include/spl.h @@ -219,12 +219,4 @@ void spl_board_init(void); */ bool spl_was_boot_source(void);
-/** - * Board-specific load method for boards that have a special way of loading - * U-Boot, which does not fit with the existing SPL code. - * - * @return 0 on success, negative errno value on failure. - */ -int spl_board_load_image(struct spl_boot_device *bootdev); - #endif