spl: Convert spl_spi_load_image() to use linker list

Add a linker list declaration for this method and remove the explicit
switch() code. Also set up the sunxi function.

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 9890a889abd809c830529146ce35968e39c77365..ac19e5ffcd17b75d0524eb3b96d32ef8207d9e3d 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) {
-#if defined(CONFIG_SPL_SPI_SUPPORT) || defined(CONFIG_SPL_SPI_FLASH_SUPPORT)
-       case BOOT_DEVICE_SPI:
-               return spl_spi_load_image(&bootdev);
-#endif
 #ifdef CONFIG_SPL_ETH_SUPPORT
        case BOOT_DEVICE_CPGMAC:
 #ifdef CONFIG_SPL_ETH_DEVICE

diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index e4cc0d08229f996c0c5689beab38d40417d4e75a..b9294f201ee65fa3c4b5cedc185364835704f656 100644 (file)
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -65,7 +65,7 @@ static ulong spl_spi_fit_read(struct spl_load_info *load, ulong sector,
  * configured and available since this code loads the main U-Boot image
  * from SPI into SDRAM and starts it from there.
  */
-int spl_spi_load_image(struct spl_boot_device *bootdev)
+static int spl_spi_load_image(struct spl_boot_device *bootdev)
 {
        int err = 0;
        struct spi_flash *flash;
@@ -121,3 +121,5 @@ int spl_spi_load_image(struct spl_boot_device *bootdev)
 
        return err;
 }
+/* Use priorty 1 so that boards can override this */
+SPL_LOAD_IMAGE_METHOD(1, BOOT_DEVICE_SPI, spl_spi_load_image);

diff --git a/drivers/mtd/spi/sunxi_spi_spl.c b/drivers/mtd/spi/sunxi_spi_spl.c
index 767959cdfadce4ca5ec5898aa2fad92db0838f36..70d6d1514da30b196a9493a1e78575c24a861db3 100644 (file)
--- a/drivers/mtd/spi/sunxi_spi_spl.c
+++ b/drivers/mtd/spi/sunxi_spi_spl.c
@@ -262,7 +262,7 @@ static void spi0_read_data(void *buf, u32 addr, u32 len)
 
 /*****************************************************************************/
 
-int spl_spi_load_image(struct spl_boot_device *bootdev)
+static int spl_spi_load_image(struct spl_boot_device *bootdev)
 {
        int err;
        struct image_header *header;
@@ -281,3 +281,5 @@ int spl_spi_load_image(struct spl_boot_device *bootdev)
        spi0_deinit();
        return 0;
 }
+/* Use priorty 0 to override the default if it happens to be linked in */
+SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_SPI, spl_spi_load_image);

diff --git a/include/spl.h b/include/spl.h
index 2d0e128712934214a9a6b24b3ba3abfc9a9e141d..d46ddd497f410f864b575b349c8bd6ed3da33906 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -181,9 +181,6 @@ struct spl_image_loader {
                .load_image = __method, \
        }
 
-/* SPI SPL functions */
-int spl_spi_load_image(struct spl_boot_device *bootdev);
-
 /* Ethernet SPL functions */
 int spl_net_load_image(struct spl_boot_device *bootdev);