diff options
| author | Simon Glass | 2016-09-24 18:20:01 -0600 |
|---|---|---|
| committer | Tom Rini | 2016-10-06 15:06:56 -0400 |
| commit | 7d7dd821b0921d762a1dbfae48f2c3aa3ff29df6 (patch) | |
| tree | 6b5aa20f42ca9461ce70eabb72c66e8a5b705ada | |
| parent | 0fed9c7ed69c7f85f0f76fd58c1ef6ea991a786c (diff) | |
spl: Convert spl_ubi_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 | 6 | ||||
| -rw-r--r-- | common/spl/spl_ubi.c | 3 | ||||
| -rw-r--r-- | include/spl.h | 3 |
3 files changed, 3 insertions, 9 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c index 321709916fe..9be256e3133 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -384,11 +384,6 @@ static int spl_load_image(u32 boot_device) return loader->load_image(&bootdev); switch (boot_device) { -#ifdef CONFIG_SPL_UBI - case BOOT_DEVICE_NAND: - case BOOT_DEVICE_ONENAND: - return spl_ubi_load_image(&bootdev); -#else #ifdef CONFIG_SPL_NAND_SUPPORT case BOOT_DEVICE_NAND: return spl_nand_load_image(&bootdev); @@ -397,7 +392,6 @@ static int spl_load_image(u32 boot_device) case BOOT_DEVICE_ONENAND: return spl_onenand_load_image(&bootdev); #endif -#endif #ifdef CONFIG_SPL_NOR_SUPPORT case BOOT_DEVICE_NOR: return spl_nor_load_image(&bootdev); diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c index d64e6cf57d1..3ef00aa0b08 100644 --- a/common/spl/spl_ubi.c +++ b/common/spl/spl_ubi.c @@ -76,3 +76,6 @@ out: #endif return ret; } +/* Use priorty 0 so that Ubi will override NAND and ONENAND methods */ +SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_NAND, spl_ubi_load_image); +SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_ONENAND, spl_ubi_load_image); diff --git a/include/spl.h b/include/spl.h index 174147a06a0..47c10451fee 100644 --- a/include/spl.h +++ b/include/spl.h @@ -190,9 +190,6 @@ int spl_onenand_load_image(struct spl_boot_device *bootdev); /* NOR SPL functions */ int spl_nor_load_image(struct spl_boot_device *bootdev); -/* UBI SPL functions */ -int spl_ubi_load_image(struct spl_boot_device *bootdev); - /* YMODEM SPL functions */ int spl_ymodem_load_image(struct spl_boot_device *bootdev); |