diff options
| author | Chris Packham <judge.packham@gmail.com> | 2018-08-17 20:47:41 +1200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2018-09-19 08:59:26 +0200 |
| commit | e0977297e89c19701f6ac9cf7b2743b8f1490159 (patch) | |
| tree | 85f91afa73e7b992a7686a7360e235713afffd9b /arch/arm/mach-mvebu/include/mach/soc.h | |
| parent | 7e1d32208e035b3014e8dd83dbe41506327f5d40 (diff) | |
| download | u-boot-e0977297e89c19701f6ac9cf7b2743b8f1490159.tar.gz | |
Revert "arm: mvebu: fix boot from UART when in fallback mode"
This reverts commit e83e2b390038c9075642cb243a6292241beb8d73. This
prevents kwboot from overriding the hardware strapped boot source.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'arch/arm/mach-mvebu/include/mach/soc.h')
| -rw-r--r-- | arch/arm/mach-mvebu/include/mach/soc.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index 623ab4eb8d..660dd148ab 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -110,16 +110,10 @@ #define COMPHY_REFCLK_ALIGNMENT (MVEBU_REGISTER(0x182f8)) /* BootROM error register (also includes some status infos) */ -#if defined(CONFIG_ARMADA_38X) -#define CONFIG_BOOTROM_ERR_REG (MVEBU_REGISTER(0x182d0)) -#define BOOTROM_ERR_MODE_OFFS 0 -#define BOOTROM_ERR_MODE_MASK (0xf << BOOTROM_ERR_MODE_OFFS) -#else #define CONFIG_BOOTROM_ERR_REG (MVEBU_REGISTER(0x182d0)) #define BOOTROM_ERR_MODE_OFFS 28 #define BOOTROM_ERR_MODE_MASK (0xf << BOOTROM_ERR_MODE_OFFS) #define BOOTROM_ERR_MODE_UART 0x6 -#endif #if defined(CONFIG_ARMADA_375) /* SAR values for Armada 375 */ |