[PATCH v2 u-boot-mvebu 2/6] arm: mvebu: Remove A38x BOOT_FROM_SATA 0x22 constant

[Pali Rohár]

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 at kernel.org>
Tested-by: Tony Dinh <mibodhi at gmail.com>
Tested-by: Martin Rowe <martin.p.rowe at gmail.com>
---
 arch/arm/mach-mvebu/cpu.c              | 1 -
 arch/arm/mach-mvebu/include/mach/soc.h | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c
index b72037d45b1c..0fcd520c1dbc 100644
--- 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 4a9463292fcb..3266749836a7 100644
--- 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
-- 
2.20.1