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>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index cef5ff9580c1dae76b30d76ff26350b3a0f630b8..978df648706b02931c6c64c9ac3cb069c60aec62 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_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 f10d679922f3e0c1c24319c95d383b71828650ef..b55fcc5cdb75ec11ff3c04bc502b17493139cf84 100644 (file)
--- 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);

diff --git a/include/spl.h b/include/spl.h
index e26f06eff1fdcdc908909c5c9f8872f3a0abe695..fd6ac01084ee4efd23e3cd76ad500e3d8324f6eb 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -181,9 +181,6 @@ struct spl_image_loader {
                .load_image = __method, \
        }
 
-/* NOR SPL functions */
-int spl_nor_load_image(struct spl_boot_device *bootdev);
-
 /* YMODEM SPL functions */
 int spl_ymodem_load_image(struct spl_boot_device *bootdev);