arm: mvebu: fix boot from UART on ClearFog Base

[u-boot] / arch / arm / mach-mvebu / spl.c

diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
index e273339648fb542863ba400be3b53eb69a083ad9..a72a769f7c740eeb8c4fabf46964c0ba913f2e3d 100644 (file)
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -1,29 +1,64 @@
 /*
- * Copyright (C) 2014 Stefan Roese <sr@denx.de>
+ * Copyright (C) 2014-2016 Stefan Roese <sr@denx.de>
  *
  * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <dm.h>
+#include <debug_uart.h>
+#include <fdtdec.h>
 #include <spl.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
-u32 spl_boot_device(void)
+static u32 get_boot_device(void)
 {
-#if defined(CONFIG_SPL_SPI_FLASH_SUPPORT)
-       return BOOT_DEVICE_SPI;
+       u32 val;
+       u32 boot_device;
+
+       /*
+        * First check, if UART boot-mode is active. This can only
+        * be done, via the bootrom error register. Here the
+        * MSB marks if the UART mode is active.
+        */
+       val = readl(CONFIG_BOOTROM_ERR_REG);
+       boot_device = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS;
+       debug("BOOTROM_REG=0x%08x boot_device=0x%x\n", val, boot_device);
+       if (boot_device == BOOTROM_ERR_MODE_UART)
+               return BOOT_DEVICE_UART;
+
+       /*
+        * Now check the SAR register for the strapped boot-device
+        */
+       val = readl(CONFIG_SAR_REG);    /* SAR - Sample At Reset */
+       boot_device = (val & BOOT_DEV_SEL_MASK) >> BOOT_DEV_SEL_OFFS;
+       debug("SAR_REG=0x%08x boot_device=0x%x\n", val, boot_device);
+       switch (boot_device) {
+#ifdef CONFIG_SPL_MMC_SUPPORT
+       case BOOT_FROM_MMC:
+       case BOOT_FROM_MMC_ALT:
+               return BOOT_DEVICE_MMC1;
 #endif
-#if defined(CONFIG_SPL_MMC_SUPPORT)
-       return BOOT_DEVICE_MMC1;
+       case BOOT_FROM_UART:
+#ifdef BOOT_FROM_UART_ALT
+       case BOOT_FROM_UART_ALT:
 #endif
+               return BOOT_DEVICE_UART;
+       case BOOT_FROM_SPI:
+       default:
+               return BOOT_DEVICE_SPI;
+       };
+}
+
+u32 spl_boot_device(void)
+{
+       return get_boot_device();
 }
 
 #ifdef CONFIG_SPL_MMC_SUPPORT
-u32 spl_boot_mode(void)
+u32 spl_boot_mode(const u32 boot_device)
 {
        return MMCSD_MODE_RAW;
 }
@@ -31,21 +66,7 @@ u32 spl_boot_mode(void)
 
 void board_init_f(ulong dummy)
 {
-       /* Set global data pointer */
-       gd = &gdata;
-
-#ifndef CONFIG_MVEBU_BOOTROM_UARTBOOT
-       /*
-        * Only call arch_cpu_init() when not returning to the
-        * Marvell BootROM, which is done when booting via
-        * the xmodem protocol (kwboot tool). Otherwise the
-        * internal register will get remapped and the BootROM
-        * can't continue to run correctly.
-        */
-
-       /* Linux expects the internal registers to be at 0xf1000000 */
-       arch_cpu_init();
-#endif
+       int ret;
 
        /*
         * Pin muxing needs to be done before UART output, since
@@ -54,17 +75,40 @@ void board_init_f(ulong dummy)
         */
        board_early_init_f();
 
+       /* Example code showing how to enable the debug UART on MVEBU */
+#ifdef EARLY_UART
+       /*
+        * Debug UART can be used from here if required:
+        *
+        * debug_uart_init();
+        * printch('a');
+        * printhex8(0x1234);
+        * printascii("string");
+        */
+#endif
+
+       ret = spl_init();
+       if (ret) {
+               debug("spl_init() failed: %d\n", ret);
+               hang();
+       }
+
+       /* Use special translation offset for SPL */
+       dm_set_translation_offset(0xd0000000 - 0xf1000000);
+
        preloader_console_init();
 
        timer_init();
 
+       /* Armada 375 does not support SerDes and DDR3 init yet */
+#if !defined(CONFIG_ARMADA_375)
        /* First init the serdes PHY's */
        serdes_phy_config();
 
        /* Setup DDR */
        ddr3_init();
+#endif
 
-#ifdef CONFIG_MVEBU_BOOTROM_UARTBOOT
        /*
         * Return to the BootROM to continue the Marvell xmodem
         * UART boot protocol. As initiated by the kwboot tool.
@@ -76,6 +120,6 @@ void board_init_f(ulong dummy)
         * need to return to the BootROM to enable this xmodem
         * UART download.
         */
-       return_to_bootrom();
-#endif
+       if (get_boot_device() == BOOT_DEVICE_UART)
+               return_to_bootrom();
 }