diff options
| author | Simon Glass <sjg@chromium.org> | 2016-09-24 18:20:03 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-06 15:06:58 -0400 |
| commit | afa6e6c48845bac39a73b41012e8d7a53b13598d (patch) | |
| tree | 9d65158d116c515f5b3cccc74898f97e5279a477 | |
| parent | d5c2b11ce40f8ca849008938515e742e6b7efc18 (diff) | |
spl: Convert spl_onenand_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>
| -rw-r--r-- | common/spl/spl.c | 4 | ||||
| -rw-r--r-- | common/spl/spl_onenand.c | 4 | ||||
| -rw-r--r-- | include/spl.h | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index bbf87096a70..cef5ff9580c 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_ONENAND_SUPPORT - case BOOT_DEVICE_ONENAND: - return spl_onenand_load_image(&bootdev); -#endif #ifdef CONFIG_SPL_NOR_SUPPORT case BOOT_DEVICE_NOR: return spl_nor_load_image(&bootdev); diff --git a/common/spl/spl_onenand.c b/common/spl/spl_onenand.c index f5e2f95b13e..361a1b34dbe 100644 --- a/common/spl/spl_onenand.c +++ b/common/spl/spl_onenand.c @@ -14,7 +14,7 @@ #include <asm/io.h> #include <onenand_uboot.h> -int spl_onenand_load_image(struct spl_boot_device *bootdev) +static int spl_onenand_load_image(struct spl_boot_device *bootdev) { struct image_header *header; int ret; @@ -34,3 +34,5 @@ int spl_onenand_load_image(struct spl_boot_device *bootdev) return 0; } +/* Use priorty 1 so that Ubi can override this */ +SPL_LOAD_IMAGE_METHOD(1, BOOT_DEVICE_ONENAND, spl_onenand_load_image); diff --git a/include/spl.h b/include/spl.h index 927f300f3d1..e26f06eff1f 100644 --- a/include/spl.h +++ b/include/spl.h @@ -181,9 +181,6 @@ struct spl_image_loader { .load_image = __method, \ } -/* OneNAND SPL functions */ -int spl_onenand_load_image(struct spl_boot_device *bootdev); - /* NOR SPL functions */ int spl_nor_load_image(struct spl_boot_device *bootdev); |