diff options
| author | Simon Glass <sjg@chromium.org> | 2016-09-24 18:20:04 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-06 15:06:59 -0400 |
| commit | 548b3ee73ca6fc042b85e0b171be36d942eeffb5 (patch) | |
| tree | d250680a56531e96381c02bc0c41cd8a5f1d61cb /common/spl | |
| parent | afa6e6c48845bac39a73b41012e8d7a53b13598d (diff) | |
| download | u-boot-imx-548b3ee73ca6fc042b85e0b171be36d942eeffb5.zip u-boot-imx-548b3ee73ca6fc042b85e0b171be36d942eeffb5.tar.gz u-boot-imx-548b3ee73ca6fc042b85e0b171be36d942eeffb5.tar.bz2 | |
spl: Convert spl_nor_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 | 4 | ||||
| -rw-r--r-- | common/spl/spl_nor.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index cef5ff9..978df64 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -384,10 +384,6 @@ static int spl_load_image(u32 boot_device) return loader->load_image(&bootdev); switch (boot_device) { -#ifdef CONFIG_SPL_NOR_SUPPORT - case BOOT_DEVICE_NOR: - return spl_nor_load_image(&bootdev); -#endif #ifdef CONFIG_SPL_YMODEM_SUPPORT case BOOT_DEVICE_UART: return spl_ymodem_load_image(&bootdev); diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index f10d679..b55fcc5 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -7,7 +7,7 @@ #include <common.h> #include <spl.h> -int spl_nor_load_image(struct spl_boot_device *bootdev) +static int spl_nor_load_image(struct spl_boot_device *bootdev) { int ret; /* @@ -70,3 +70,4 @@ int spl_nor_load_image(struct spl_boot_device *bootdev) return 0; } +SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_NOR, spl_nor_load_image); |