arm: mvebu: Remove A38x BOOT_FROM_SATA 0x22 constant

A385 BootROM treats strapping configuration 0x22 as SPI-NAND. So remove
incorrect definition 0x22 as SATA. SATA on A385 has configuration 0x2A.

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 b72037d45b1c31a3ca91494840dccddaee1dfa48..0fcd520c1dbcfe45c8f486d0d9fef1197b02e057 100644 (file)
--- a/arch/arm/mach-mvebu/cpu.c
+++ b/arch/arm/mach-mvebu/cpu.c
@@ -114,7 +114,6 @@ u32 get_boot_device(void)
                return BOOT_DEVICE_UART;
 #ifdef BOOT_FROM_SATA
        case BOOT_FROM_SATA:
-       case BOOT_FROM_SATA_ALT:
                return BOOT_DEVICE_SATA;
 #endif
        case BOOT_FROM_SPI:

diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h
index 4a9463292fcb0d9901757c905923662ba0f59496..3266749836a76362bfa99c1f094d64b7844028b4 100644 (file)
--- a/arch/arm/mach-mvebu/include/mach/soc.h
+++ b/arch/arm/mach-mvebu/include/mach/soc.h
@@ -161,9 +161,8 @@
 #define BOOT_DEV_SEL_MASK      (0x3f << BOOT_DEV_SEL_OFFS)
 
 #define BOOT_FROM_NAND         0x0A
-#define BOOT_FROM_SATA         0x22
+#define BOOT_FROM_SATA         0x2A
 #define BOOT_FROM_UART         0x28
-#define BOOT_FROM_SATA_ALT     0x2A
 #define BOOT_FROM_SPI          0x32
 #define BOOT_FROM_MMC          0x30
 #define BOOT_FROM_MMC_ALT      0x31