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>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index bbf87096a70b4345dabab79b65ea7fae90302b77..cef5ff9580c1dae76b30d76ff26350b3a0f630b8 100644 (file)
--- 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 f5e2f95b13ea5090f0602884c9237648ec05e53e..361a1b34dbe2ac02a45e2ad979010bc9115a60a7 100644 (file)
--- 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 927f300f3d12aec9d8c32cfa7c78453c90094f3a..e26f06eff1fdcdc908909c5c9f8872f3a0abe695 100644 (file)
--- 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);