imx28: Fix issue with GCC 5.x

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

diff --git a/arch/arm/cpu/arm926ejs/mxs/mxs.c b/arch/arm/cpu/arm926ejs/mxs/mxs.c
index f3c1575a36897bff3c6913be37309d70c1db120f..cc4122dc0da35b380cc2cdfaa2717ca79f03fa0b 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mxs/mxs.c
+++ b/arch/arm/cpu/arm926ejs/mxs/mxs.c
@@ -24,7 +24,7 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 /* Lowlevel init isn't used on i.MX28, so just have a dummy here */
-inline void lowlevel_init(void) {}
+void lowlevel_init(void) {}
 
 #define BOOT_CAUSE_MASK                (RTC_PERSISTENT0_EXTERNAL_RESET |       \
                                RTC_PERSISTENT0_ALARM_WAKE |            \
@@ -108,22 +108,13 @@ void enable_caches(void)
  */
 void mx28_fixup_vt(uint32_t start_addr)
 {
-       /* ldr pc, [pc, #0x18] */
        /* Jumptable location is 0x0 */
        uint32_t *vt = (uint32_t *)0x20;
        uint32_t cr = get_cr();
 
-<<<<<<< HEAD
-       for (i = 0; i < 8; i++) {
-               /* cppcheck-suppress nullPointer */
-               vt[i] = ldr_pc;
-               /* cppcheck-suppress nullPointer */
-               vt[i + 8] = start_addr + (4 * i);
-       }
-=======
+       /* cppcheck-suppress nullPointer */
        memcpy(vt, (void *)start_addr + 0x20, 32);
        set_cr(cr & ~CR_V);
->>>>>>> karo-tx-uboot
 }
 
 #ifdef CONFIG_ARCH_MISC_INIT
@@ -255,7 +246,7 @@ int do_mx28_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 /*
  * Initializes on-chip ethernet controllers.
  */
-#if defined(CONFIG_MX28) && defined(CONFIG_CMD_NET)
+#if defined(CONFIG_SOC_MX28) && defined(CONFIG_CMD_NET)
 int cpu_eth_init(bd_t *bis)
 {
        struct mxs_clkctrl_regs *clkctrl_regs =