SPL: Add support for loading image from ram in SPL.

Signed-off-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>

diff --git a/README b/README
index c5e6a1a4c8501caed773ad7b5b1e33d2df48c98c..a745d0b379b395d23de4b1cc6d21e12f3ce4cd56 100644 (file)
--- a/README
+++ b/README
@@ -2669,6 +2669,9 @@ FIT uImage format:
                CONFIG_SPL_SPI_SUPPORT
                Support for drivers/spi/libspi.o in SPL binary
 
+               CONFIG_SPL_RAM_DEVICE
+               Support for running image already present in ram, in SPL binary
+
                CONFIG_SPL_LIBGENERIC_SUPPORT
                Support for lib/libgeneric.o in SPL binary
 

diff --git a/common/spl/spl.c b/common/spl/spl.c
index f2f6de7f2ac8d684c003e939eae6d5c75443aaca..c640f874040b9f118ca44e30c8f3936379cce6b2 100644 (file)
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -128,6 +128,23 @@ static void __noreturn jump_to_image_no_args(void)
        image_entry((u32 *)boot_params_ptr_addr);
 }
 
+#ifdef CONFIG_SPL_RAM_DEVICE
+static void spl_ram_load_image(void)
+{
+       const struct image_header *header;
+
+       /*
+        * Get the header.  It will point to an address defined by handoff
+        * which will tell where the image located inside the flash. For
+        * now, it will temporary fixed to address pointed by U-Boot.
+        */
+       header = (struct image_header *)
+               (CONFIG_SYS_TEXT_BASE - sizeof(struct image_header));
+
+       spl_parse_image_header(header);
+}
+#endif
+
 void board_init_r(gd_t *dummy1, ulong dummy2)
 {
        u32 boot_device;
@@ -145,6 +162,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2)
        boot_device = spl_boot_device();
        debug("boot device - %d\n", boot_device);
        switch (boot_device) {
+#ifdef CONFIG_SPL_RAM_DEVICE
+       case BOOT_DEVICE_RAM:
+               spl_ram_load_image();
+               break;
+#endif
 #ifdef CONFIG_SPL_MMC_SUPPORT
        case BOOT_DEVICE_MMC1:
        case BOOT_DEVICE_MMC2:

diff --git a/doc/README.SPL b/doc/README.SPL
index 536858664726e076d18d0654f32d62b6817a3964..4e1cb28800411e0c7f626970bec2326baf45d49c 100644 (file)
--- a/doc/README.SPL
+++ b/doc/README.SPL
@@ -66,6 +66,7 @@ CONFIG_SPL_DMA_SUPPORT (drivers/dma/libdma.o)
 CONFIG_SPL_POST_MEM_SUPPORT (post/drivers/memory.o)
 CONFIG_SPL_NAND_LOAD (drivers/mtd/nand/nand_spl_load.o)
 CONFIG_SPL_SPI_LOAD (drivers/mtd/spi/spi_spl_load.o)
+CONFIG_SPL_RAM_DEVICE (common/spl/spl.c)
 
 
 Normally CPU is assumed to be the same between the SPL and normal