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/spl.c | |
| parent | 7e1d32208e035b3014e8dd83dbe41506327f5d40 (diff) | |
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/spl.c')
| -rw-r--r-- | arch/arm/mach-mvebu/spl.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c index 50b24f5760..4c3933b835 100644 --- a/arch/arm/mach-mvebu/spl.c +++ b/arch/arm/mach-mvebu/spl.c @@ -25,16 +25,7 @@ static u32 get_boot_device(void) val = readl(CONFIG_BOOTROM_ERR_REG); boot_device = (val & BOOTROM_ERR_MODE_MASK) >> BOOTROM_ERR_MODE_OFFS; debug("BOOTROM_REG=0x%08x boot_device=0x%x\n", val, boot_device); -#if defined(CONFIG_ARMADA_38X) - /* - * If the bootrom error register contains any else than zeros - * in the first 8 bits it's an error condition. And in that case - * try to boot from UART. - */ - if (boot_device) -#else if (boot_device == BOOTROM_ERR_MODE_UART) -#endif return BOOT_DEVICE_UART; /* |