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>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 321709916fe52f372a0c1a1d0838625c344be995..9be256e3133ffb8e3d4ea22fd1b9afde08600efe 100644 (file)
--- 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 d64e6cf57d18c5d16ea87ff68717de2df00d46d0..3ef00aa0b08744ffb2905f71ebf0080df26b4141 100644 (file)
--- 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 174147a06a0ebe2aa9b8fa47cd6362fdcd4effe0..47c10451fee6bc57a89efefacf9795b2988f0640 100644 (file)
--- 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);