SPL:SPI: Add Falcon Mode support

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

diff --git a/drivers/mtd/spi/spi_spl_load.c b/drivers/mtd/spi/spi_spl_load.c
index 29355307f3689c0b61f2c6432a0033c4504a8c0f..1954b7e8860f411f97825caa93735f2c054e839e 100644 (file)
--- a/drivers/mtd/spi/spi_spl_load.c
+++ b/drivers/mtd/spi/spi_spl_load.c
@@ -13,6 +13,35 @@
 #include <spi_flash.h>
 #include <spl.h>
 
+#ifdef CONFIG_SPL_OS_BOOT
+/*
+ * Load the kernel, check for a valid header we can parse, and if found load
+ * the kernel and then device tree.
+ */
+static int spi_load_image_os(struct spi_flash *flash,
+                            struct image_header *header)
+{
+       /* Read for a header, parse or error out. */
+       spi_flash_read(flash, CONFIG_SYS_SPI_KERNEL_OFFS, 0x40,
+                      (void *)header);
+
+       if (image_get_magic(header) != IH_MAGIC)
+               return -1;
+
+       spl_parse_image_header(header);
+
+       spi_flash_read(flash, CONFIG_SYS_SPI_KERNEL_OFFS,
+                      spl_image.size, (void *)spl_image.load_addr);
+
+       /* Read device tree. */
+       spi_flash_read(flash, CONFIG_SYS_SPI_ARGS_OFFS,
+                      CONFIG_SYS_SPI_ARGS_SIZE,
+                      (void *)CONFIG_SYS_SPL_ARGS_ADDR);
+
+       return 0;
+}
+#endif
+
 /*
  * 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
@@ -37,10 +66,15 @@ void spl_spi_load_image(void)
        /* use CONFIG_SYS_TEXT_BASE as temporary storage area */
        header = (struct image_header *)(CONFIG_SYS_TEXT_BASE);
 
-       /* 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);
+#ifdef CONFIG_SPL_OS_BOOT
+       if (spl_start_uboot() || spi_load_image_os(flash, header))
+#endif
+       {
+               /* 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);
+       }
 }