USB: DM: Convert i.MX5 ehci code to driver model

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

diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c
index 2fd6c62589ae3ca2d99c029693ce939666d369c9..9dd7c84b6874d6ba09729279a2227276463e3c9a 100644 (file)
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -1,7 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2014-2016 Stefan Roese <sr@denx.de>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -26,17 +25,18 @@ static u32 get_boot_device(void)
        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 defined(CONFIG_ARMADA_38X)
+       if (boot_device == BOOTROM_ERR_MODE_UART)
+               return BOOT_DEVICE_UART;
+
+#ifdef CONFIG_ARMADA_38X
        /*
-        * If the bootrom error register contains any else than zeros
-        * in the first 8 bits it's an error condition. And in that case
-        * try to boot from UART.
+        * If the bootrom error code contains any other than zeros it's an
+        * error condition and the bootROM has fallen back to UART boot
         */
+       boot_device = (val & BOOTROM_ERR_CODE_MASK) >> BOOTROM_ERR_CODE_OFFS;
        if (boot_device)
-#else
-       if (boot_device == BOOTROM_ERR_MODE_UART)
-#endif
                return BOOT_DEVICE_UART;
+#endif
 
        /*
         * Now check the SAR register for the strapped boot-device
@@ -45,6 +45,10 @@ static u32 get_boot_device(void)
        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) {
+#if defined(CONFIG_ARMADA_38X)
+       case BOOT_FROM_NAND:
+               return BOOT_DEVICE_NAND;
+#endif
 #ifdef CONFIG_SPL_MMC_SUPPORT
        case BOOT_FROM_MMC:
        case BOOT_FROM_MMC_ALT:
@@ -66,13 +70,6 @@ u32 spl_boot_device(void)
        return get_boot_device();
 }
 
-#ifdef CONFIG_SPL_MMC_SUPPORT
-u32 spl_boot_mode(const u32 boot_device)
-{
-       return MMCSD_MODE_RAW;
-}
-#endif
-
 void board_init_f(ulong dummy)
 {
        int ret;
@@ -128,7 +125,15 @@ void board_init_f(ulong dummy)
         * SPL has no chance to receive this information. So we
         * need to return to the BootROM to enable this xmodem
         * UART download.
+        *
+        * If booting from NAND lets let the BootROM load the
+        * rest of the bootloader.
         */
-       if (get_boot_device() == BOOT_DEVICE_UART)
-               return_to_bootrom();
+       switch (get_boot_device()) {
+               case BOOT_DEVICE_UART:
+#if defined(CONFIG_ARMADA_38X)
+               case BOOT_DEVICE_NAND:
+#endif
+                       return_to_bootrom();
+       }
 }