omap4/5: Add support for booting with CH.

[platform/kernel/u-boot.git] / arch / arm / cpu / armv7 / omap-common / spl.c

diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c
index b201543..d6d7d65 100644 (file)
--- a/arch/arm/cpu/armv7/omap-common/spl.c
+++ b/arch/arm/cpu/armv7/omap-common/spl.c
@@ -24,12 +24,23 @@
  */
 #include <common.h>
 #include <asm/u-boot.h>
+#include <asm/utils.h>
 #include <asm/arch/sys_proto.h>
-#include <timestamp_autogenerated.h>
-#include <version_autogenerated.h>
+#include <nand.h>
+#include <mmc.h>
+#include <fat.h>
+#include <version.h>
+#include <asm/omap_common.h>
+#include <asm/arch/mmc_host_def.h>
+#include <i2c.h>
+#include <image.h>
+#include <malloc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+u32* boot_params_ptr = NULL;
+struct spl_image_info spl_image;
+
 /* Define global data structure pointer to it*/
 static gd_t gdata __attribute__ ((section(".data")));
 static bd_t bdata __attribute__ ((section(".data")));
@@ -53,12 +64,91 @@ void board_init_f(ulong dummy)
        relocate_code(CONFIG_SPL_STACK, &gdata, CONFIG_SPL_TEXT_BASE);
 }
 
+void spl_parse_image_header(const struct image_header *header)
+{
+       u32 header_size = sizeof(struct image_header);
+
+       if (__be32_to_cpu(header->ih_magic) == IH_MAGIC) {
+               spl_image.size = __be32_to_cpu(header->ih_size) + header_size;
+               spl_image.entry_point = __be32_to_cpu(header->ih_load);
+               /* Load including the header */
+               spl_image.load_addr = spl_image.entry_point - header_size;
+               spl_image.os = header->ih_os;
+               spl_image.name = (const char *)&header->ih_name;
+               debug("spl: payload image: %s load addr: 0x%x size: %d\n",
+                       spl_image.name, spl_image.load_addr, spl_image.size);
+       } else {
+               /* Signature not found - assume u-boot.bin */
+               printf("mkimage signature not found - ih_magic = %x\n",
+                       header->ih_magic);
+               puts("Assuming u-boot.bin ..\n");
+               /* Let's assume U-Boot will not be more than 200 KB */
+               spl_image.size = 200 * 1024;
+               spl_image.entry_point = CONFIG_SYS_TEXT_BASE;
+               spl_image.load_addr = CONFIG_SYS_TEXT_BASE;
+               spl_image.os = IH_OS_U_BOOT;
+               spl_image.name = "U-Boot";
+       }
+}
+
+static void jump_to_image_no_args(void)
+{
+       typedef void (*image_entry_noargs_t)(u32 *)__attribute__ ((noreturn));
+       image_entry_noargs_t image_entry =
+                       (image_entry_noargs_t) spl_image.entry_point;
+
+       debug("image entry point: 0x%X\n", spl_image.entry_point);
+       /* Pass the saved boot_params from rom code */
+#if defined(CONFIG_VIRTIO) || defined(CONFIG_ZEBU)
+       image_entry = 0x80100000;
+#endif
+       image_entry((u32 *)&boot_params_ptr);
+}
+
+void jump_to_image_no_args(void) __attribute__ ((noreturn));
 void board_init_r(gd_t *id, ulong dummy)
 {
-       for (;;)
-               ;
+       u32 boot_device;
+       debug(">>spl:board_init_r()\n");
+
+       mem_malloc_init(CONFIG_SYS_SPL_MALLOC_START,
+                       CONFIG_SYS_SPL_MALLOC_SIZE);
+
+       timer_init();
+       i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+
+       boot_device = omap_boot_device();
+       debug("boot device - %d\n", boot_device);
+       switch (boot_device) {
+#ifdef CONFIG_SPL_MMC_SUPPORT
+       case BOOT_DEVICE_MMC1:
+       case BOOT_DEVICE_MMC2:
+               spl_mmc_load_image();
+               break;
+#endif
+#ifdef CONFIG_SPL_NAND_SUPPORT
+       case BOOT_DEVICE_NAND:
+               spl_nand_load_image();
+               break;
+#endif
+       default:
+               printf("SPL: Un-supported Boot Device - %d!!!\n", boot_device);
+               hang();
+               break;
+       }
+
+       switch (spl_image.os) {
+       case IH_OS_U_BOOT:
+               debug("Jumping to U-Boot\n");
+               jump_to_image_no_args();
+               break;
+       default:
+               puts("Unsupported OS image.. Jumping nevertheless..\n");
+               jump_to_image_no_args();
+       }
 }
 
+/* This requires UART clocks to be enabled */
 void preloader_console_init(void)
 {
        const char *u_boot_rev = U_BOOT_VERSION;
@@ -69,9 +159,10 @@ void preloader_console_init(void)
        gd->flags |= GD_FLG_RELOC;
        gd->baudrate = CONFIG_BAUDRATE;
 
-       setup_clocks_for_console();
        serial_init();          /* serial communications setup */
 
+       gd->have_console = 1;
+
        /* Avoid a second "U-Boot" coming from this string */
        u_boot_rev = &u_boot_rev[7];
 
@@ -80,3 +171,11 @@ void preloader_console_init(void)
        omap_rev_string(rev_string_buffer);
        printf("Texas Instruments %s\n", rev_string_buffer);
 }
+
+void __omap_rev_string(char *str)
+{
+       sprintf(str, "Revision detection unimplemented");
+}
+
+void omap_rev_string(char *str)
+       __attribute__((weak, alias("__omap_rev_string")));