提交 0fed9c7e 编写于 作者: S Simon Glass 提交者: Tom Rini

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: NSimon Glass <sjg@chromium.org>
Reviewed-by: NTom Rini <trini@konsulko.com>
上级 98136b2f
...@@ -384,12 +384,6 @@ static int spl_load_image(u32 boot_device) ...@@ -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:
......
...@@ -267,7 +267,7 @@ int spl_mmc_do_fs_boot(struct mmc *mmc) ...@@ -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) ...@@ -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);
...@@ -193,9 +193,6 @@ int spl_nor_load_image(struct spl_boot_device *bootdev); ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册