Merge branch 'master' of git://git.denx.de/u-boot-nds32

[u-boot] / drivers / mtd / spi / spi_spl_load.c

diff --git a/drivers/mtd/spi/spi_spl_load.c b/drivers/mtd/spi/spi_spl_load.c
index 1aa30aca7e84e122d3dce2e8718773279ffbc763..7c799ca482ca6617ad29fe05ddd52b927f0a5e68 100644 (file)
--- a/drivers/mtd/spi/spi_spl_load.c
+++ b/drivers/mtd/spi/spi_spl_load.c
@@ -6,34 +6,22 @@
  * Copyright (C) 2011
  * Heiko Schocher, DENX Software Engineering, hs@denx.de.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #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 +30,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);
 }