V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

spl: Convert spl_mmc_load_image() to use linker list 

Add a linker list declaration for this method and remove the explicit
switch() code.

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:20:00 -06:00 committed by Tom Rini
parent 98136b2f26
commit 0fed9c7ed6
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/spl/spl.c
View File

@ -384,12 +384,6 @@ static int spl_load_image(u32 boot_device)
return loader->load_image(&bootdev); return loader->load_image(&bootdev);
switch (boot_device) { switch (boot_device) {
#ifdef CONFIG_SPL_MMC_SUPPORT
case BOOT_DEVICE_MMC1:
case BOOT_DEVICE_MMC2:
case BOOT_DEVICE_MMC2_2:
return spl_mmc_load_image(&bootdev);
#endif
#ifdef CONFIG_SPL_UBI #ifdef CONFIG_SPL_UBI
case BOOT_DEVICE_NAND: case BOOT_DEVICE_NAND:
case BOOT_DEVICE_ONENAND: case BOOT_DEVICE_ONENAND:

6
common/spl/spl_mmc.c
View File

@ -267,7 +267,7 @@ int spl_mmc_do_fs_boot(struct mmc *mmc)
} }
#endif #endif
int spl_mmc_load_image(struct spl_boot_device *bootdev) static int spl_mmc_load_image(struct spl_boot_device *bootdev)
{ {
struct mmc *mmc = NULL; struct mmc *mmc = NULL;
u32 boot_mode; u32 boot_mode;
@ -345,3 +345,7 @@ int spl_mmc_load_image(struct spl_boot_device *bootdev)
return err; return err;
} }
SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_MMC1, spl_mmc_load_image);
SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_MMC2, spl_mmc_load_image);
SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_MMC2_2, spl_mmc_load_image);

3
include/spl.h
View File

@ -193,9 +193,6 @@ int spl_nor_load_image(struct spl_boot_device *bootdev);
/* UBI SPL functions */ /* UBI SPL functions */
int spl_ubi_load_image(struct spl_boot_device *bootdev); int spl_ubi_load_image(struct spl_boot_device *bootdev);
/* MMC SPL functions */
int spl_mmc_load_image(struct spl_boot_device *bootdev);
/* YMODEM SPL functions */ /* YMODEM SPL functions */
int spl_ymodem_load_image(struct spl_boot_device *bootdev); int spl_ymodem_load_image(struct spl_boot_device *bootdev);