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

[karo-tx-uboot.git] / arch / arm / cpu / arm926ejs / mxs / spl_boot.c

diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
index 68c30afc48be85f46cf8e3d4ae0ed8e3372c4212..d29b9aaf3da576889bfb02620e8e7aeb106b8db7 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_boot.c
@@ -13,9 +13,16 @@
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
+#include <linux/compiler.h>
 
 #include "mxs_init.h"
 
+DECLARE_GLOBAL_DATA_PTR;
+static gd_t gdata __section(".data");
+#ifdef CONFIG_SPL_SERIAL_SUPPORT
+static bd_t bdata __section(".data");
+#endif
+
 /*
  * This delay function is intended to be used only in early stage of boot, where
  * clock are not set up yet. The timer used here is reset on every boot and
@@ -102,6 +109,30 @@ static uint8_t mxs_get_bootmode_index(void)
        return i;
 }
 
+static void mxs_spl_fixup_vectors(void)
+{
+       /*
+        * Copy our vector table to 0x0, since due to HAB, we cannot
+        * be loaded to 0x0. We want to have working vectoring though,
+        * thus this fixup. Our vectoring table is PIC, so copying is
+        * fine.
+        */
+       extern uint32_t _start;
+
+       /* cppcheck-suppress nullPointer */
+       memcpy(0x0, &_start, 0x60);
+}
+
+static void mxs_spl_console_init(void)
+{
+#ifdef CONFIG_SPL_SERIAL_SUPPORT
+       gd->bd = &bdata;
+       gd->baudrate = CONFIG_BAUDRATE;
+       serial_init();
+       gd->have_console = 1;
+#endif
+}
+
 void mxs_common_spl_init(const uint32_t arg, const uint32_t *resptr,
                         const iomux_cfg_t *iomux_setup,
                         const unsigned int iomux_size)
@@ -109,8 +140,14 @@ void mxs_common_spl_init(const uint32_t arg, const uint32_t *resptr,
        struct mxs_spl_data *data = (struct mxs_spl_data *)
                ((CONFIG_SYS_TEXT_BASE - sizeof(struct mxs_spl_data)) & ~0xf);
        uint8_t bootmode = mxs_get_bootmode_index();
+       gd = &gdata;
+
+       mxs_spl_fixup_vectors();
 
        mxs_iomux_setup_multiple_pads(iomux_setup, iomux_size);
+
+       mxs_spl_console_init();
+
        mxs_power_init();
 
        mxs_mem_init();