ARM: versatilepb : drop warnings due to double definitions
PATCH 1/1 ARM: versatilepb : drop warnings due to double definitions
CONFIG_ARCH_VERSATILE_PB is defined twice - drop
the define from config.h.
Signed-off-by Stefano Babic <[email protected]>
--- boards.cfg | 2 +- include/configs/versatile.h | 4 ---- 2 files changed, 1 insertions(+), 5 deletions(-)
boards.cfg +1 -1
@@ -77,7 +77,7 @@ voiceblue arm arm925t omap1510inn arm arm925t - ti integratorap_cm926ejs arm arm926ejs integrator armltd - integratorap integratorcp_cm926ejs arm arm926ejs integrator armltd - integratorcp -versatileqemu arm arm926ejs versatile armltd versatile versatile:ARCH_VERSATILE_QEMU +versatileqemu arm arm926ejs versatile armltd versatile versatile:ARCH_VERSATILE_QEMU,ARCH_VERSATILE_PB versatilepb arm arm926ejs versatile armltd versatile versatile:ARCH_VERSATILE_PB versatileab arm arm926ejs versatile armltd versatile versatile:ARCH_VERSATILE_AB aspenite arm arm926ejs - Marvell armada100
include/configs/versatile.h +0 -4
@@ -39,10 +39,6 @@#define CONFIG_VERSATILE 1/* in Versatile Platform Board */ #define CONFIG_ARCH_VERSATILE 1/* Specifically, a Versatile */ -#ifndef CONFIG_ARCH_VERSATILE_AB /* AB */ -#define CONFIG_ARCH_VERSATILE_PB /* Versatile PB is default */ -#endif -#define CONFIG_SYS_MEMTEST_START 0x100000#define CONFIG_SYS_MEMTEST_END 0x10000000#define CONFIG_SYS_HZ (1000000 / 256)
Signature · 1 line
1.7.1
PATCH 1/1 ARM: versatilepb : drop warnings due to double definitions
Hi Stefano,
Le 30/08/2011 09:24, Stefano Babic a ?crit :
Quoted 8 lines
CONFIG_ARCH_VERSATILE_PBis defined twice - drop
the define fromconfig.h.Signed-off-by Stefano Babic<[email protected]>--- boards.cfg | 2 +- include/configs/versatile.h | 4 ---- 2 files changed, 1 insertions(+), 5 deletions(-)
This one is trivial enough a bugfix, which leaves all three boards with only the (unrelated) 'volatile' warning, so:
Applied to u-boot-arm/master, thanks!
Amicalement,
Signature · 1 line
Albert.