diff options
| author | Pali Rohár <[email protected]> | 2023-03-29 21:03:31 +0200 |
|---|---|---|
| committer | Stefan Roese <[email protected]> | 2023-03-30 07:05:20 +0200 |
| commit | 4642bb3e76cfc3fe765dbe3174ceaffba94ea1f2 (patch) | |
| tree | 4273aa144b07c7d37bbf6c2df9ccd16d0a4f3f44 | |
| parent | 2360409d9c1defb329cdcf8108ddb3501c467a93 (diff) | |
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 <[email protected]>
Tested-by: Tony Dinh <[email protected]>
Tested-by: Martin Rowe <[email protected]>
Reviewed-by: Stefan Roese <[email protected]>
| -rw-r--r-- | arch/arm/mach-mvebu/cpu.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mvebu/include/mach/soc.h | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index b72037d45b1..0fcd520c1db 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 4a9463292fc..3266749836a 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 |