diff options
| author | Simon Glass <sjg@chromium.org> | 2016-09-25 00:20:00 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-06 19:06:56 (GMT) |
| commit | 0fed9c7ed69c7f85f0f76fd58c1ef6ea991a786c (patch) | |
| tree | 7b6c16f88f44aa6fe4a13ca5fd2d71d60155868b /common/spl | |
| parent | 98136b2f26fa4afc8e3a9954cb85038d29b2e4e3 (diff) | |
| download | u-boot-0fed9c7ed69c7f85f0f76fd58c1ef6ea991a786c.tar.xz | |
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>
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/spl.c | 6 | ||||
| -rw-r--r-- | common/spl/spl_mmc.c | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index b8ec72c..3217099 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -384,12 +384,6 @@ static int spl_load_image(u32 boot_device) return loader->load_image(&bootdev); 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 case BOOT_DEVICE_NAND: case BOOT_DEVICE_ONENAND: diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 899caf4..5e8172e 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -267,7 +267,7 @@ int spl_mmc_do_fs_boot(struct mmc *mmc) } #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; u32 boot_mode; @@ -345,3 +345,7 @@ int spl_mmc_load_image(struct spl_boot_device *bootdev) 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); |