arm: mvebu: Remove A38x BOOT_FROM_UART_ALT 0x3f constant

A385 BootROM treats strapping configuration 0x3f as invalid. When booting
fails (e.g. because of invalid configuration) then BootROM fallbacks to
UART booting.

Detecting BootROM fallback to UART booting is implemented in U-Boot since
commit 14df0dbeca3b ("ARM: mach-mvebu: handle fall-back to UART boot").

So there is no need to define BOOT_FROM_UART_ALT constant and special
handling for it anymore, remove it.

This change effectively revers commit 5321ace704d6 ("arm: mvebu: fix boot
from UART on ClearFog Base").

Signed-off-by: Pali Rohár <pali@kernel.org>
Tested-by: Tony Dinh <mibodhi@gmail.com>
Tested-by: Martin Rowe <martin.p.rowe@gmail.com>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index 8b91e174c4c16e40d59d468f680b3a0345368c13..b72037d45b1c31a3ca91494840dccddaee1dfa48 100644 (file)
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -111,9 +111,6 @@ u32 get_boot_device(void)
                return BOOT_DEVICE_MMC1;
 #endif
        case BOOT_FROM_UART:
-#ifdef BOOT_FROM_UART_ALT
-       case BOOT_FROM_UART_ALT:
-#endif
                return BOOT_DEVICE_UART;
 #ifdef BOOT_FROM_SATA
        case BOOT_FROM_SATA:

diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h
index 6edd2e2d79c7b579201fe21891c3c8ca7d77d4e1..4a9463292fcb0d9901757c905923662ba0f59496 100644 (file)
--- a/arch/arm/mach-mvebu/include/mach/soc.h
+++ b/arch/arm/mach-mvebu/include/mach/soc.h
@@ -164,7 +164,6 @@
 #define BOOT_FROM_SATA         0x22
 #define BOOT_FROM_UART         0x28
 #define BOOT_FROM_SATA_ALT     0x2A
-#define BOOT_FROM_UART_ALT     0x3f
 #define BOOT_FROM_SPI          0x32
 #define BOOT_FROM_MMC          0x30
 #define BOOT_FROM_MMC_ALT      0x31