SPL: SPI: Enhance spi_spl_load to match the other load functions

Signed-off-by: Tom Rini <trini@ti.com>

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 95dd9d50ccf84b32dacbfd576ad0b3605f623c00..40de45491e4a8ea9d058dd8e52e0f14cc1ec8b1d 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -167,8 +167,8 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
 #endif
 #ifdef CONFIG_SPL_SPI_SUPPORT
        case BOOT_DEVICE_SPI:
-               spi_boot();
-       break;
+               spl_spi_load_image();
+               break;
 #endif
        default:
                puts("SPL: Un-supported Boot Device\n");

diff --git a/drivers/mtd/spi/spi_spl_load.c b/drivers/mtd/spi/spi_spl_load.c
index 1aa30aca7e84e122d3dce2e8718773279ffbc763..d4f81f24ad1260794e4ba92ebf3e37f2466f6599 100644 (file)
--- a/drivers/mtd/spi/spi_spl_load.c
+++ b/drivers/mtd/spi/spi_spl_load.c
@@ -24,16 +24,17 @@
 
 #include <common.h>
 #include <spi_flash.h>
+#include <spl.h>
 
 /*
  * The main entry for SPI booting. It's necessary that SDRAM is already
  * configured and available since this code loads the main U-Boot image
  * from SPI into SDRAM and starts it from there.
  */
-void spi_boot(void)
+void spl_spi_load_image(void)
 {
        struct spi_flash *flash;
-       void (*uboot)(void) __noreturn;
+       struct image_header *header;
 
        /*
         * Load U-Boot image from SPI flash into RAM
@@ -42,17 +43,17 @@ void spi_boot(void)
        flash = spi_flash_probe(CONFIG_SPL_SPI_BUS, CONFIG_SPL_SPI_CS,
                                CONFIG_SF_DEFAULT_SPEED, SPI_MODE_3);
        if (!flash) {
-               puts("failed.\n");
+               puts("SPI probe failed.\n");
                hang();
        }
 
-       spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS,
-                      CONFIG_SYS_SPI_U_BOOT_SIZE,
-                      (void *) CONFIG_SYS_TEXT_BASE);
+       /* use CONFIG_SYS_TEXT_BASE as temporary storage area */
+       header = (struct image_header *)(CONFIG_SYS_TEXT_BASE);
 
-       /*
-        * Jump to U-Boot image
-        */
-       uboot = (void *) CONFIG_SYS_TEXT_BASE;
-       (*uboot)();
+       /* Load u-boot, mkimage header is 64 bytes. */
+       spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS, 0x40,
+                       (void *) header);
+       spl_parse_image_header(header);
+       spi_flash_read(flash, CONFIG_SYS_SPI_U_BOOT_OFFS,
+                      spl_image.size, (void *)spl_image.load_addr);
 }

diff --git a/include/spl.h b/include/spl.h
index cf441a16b5a37937ed991986f14aa76706ae6c42..af94a8238f18e25b4604f5455840f3a5c6054412 100644 (file)
--- a/include/spl.h
+++ b/include/spl.h
@@ -69,7 +69,7 @@ void spl_mmc_load_image(void);
 void spl_ymodem_load_image(void);
 
 /* SPI SPL functions */
-void spi_boot(void);
+void spl_spi_load_image(void);
 
 #ifdef CONFIG_SPL_BOARD_INIT
 void spl_board_init(void);