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 50b24f5760b71bbea7ce76d43fed17568a2574ae..9dd7c84b6874d6ba09729279a2227276463e3c9a 100644 (file)
--- a/arch/arm/mach-mvebu/spl.c
+++ b/arch/arm/mach-mvebu/spl.c
@@ -25,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