Message ID | 20180817084742.11628-1-judge.packham@gmail.com |
---|---|
State | Awaiting Upstream |
Delegated to: | Stefan Roese |
Headers | show |
Series | [U-Boot,v2,1/2] Revert "arm: mvebu: fix boot from UART when in fallback mode" | expand |
On 17.08.2018 10:47, Chris Packham wrote: > This reverts commit e83e2b390038c9075642cb243a6292241beb8d73. This > prevents kwboot from overriding the hardware strapped boot source. > > Signed-off-by: Chris Packham <judge.packham@gmail.com> > --- > > Changes in v2: None > > arch/arm/mach-mvebu/include/mach/soc.h | 6 ------ > arch/arm/mach-mvebu/spl.c | 9 --------- > 2 files changed, 15 deletions(-) > > diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h > index 623ab4eb8d93..660dd148abc5 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 */ > diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c > index 50b24f5760b7..4c3933b8354d 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; > > /* > Applied to u-boot-marvell/master Thanks, Stefan
diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index 623ab4eb8d93..660dd148abc5 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 */ diff --git a/arch/arm/mach-mvebu/spl.c b/arch/arm/mach-mvebu/spl.c index 50b24f5760b7..4c3933b8354d 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; /*
This reverts commit e83e2b390038c9075642cb243a6292241beb8d73. This prevents kwboot from overriding the hardware strapped boot source. Signed-off-by: Chris Packham <judge.packham@gmail.com> --- Changes in v2: None arch/arm/mach-mvebu/include/mach/soc.h | 6 ------ arch/arm/mach-mvebu/spl.c | 9 --------- 2 files changed, 15 deletions(-)