diff mbox

[U-Boot] ARM: versatilepb : drop warnings due to double definitions

Message ID 1314689067-2777-1-git-send-email-sbabic@denx.de
State Accepted
Commit 96c9745fa1f03a0e24d09a32344a1f0c821bc9af
Headers show

Commit Message

Stefano Babic Aug. 30, 2011, 7:24 a.m. UTC 
CONFIG_ARCH_VERSATILE_PB  is defined twice - drop
the define from config.h.

Signed-off-by: Stefano Babic <sbabic@denx.de>
---
 boards.cfg                  |    2 +-
 include/configs/versatile.h |    4 ----
 2 files changed, 1 insertions(+), 5 deletions(-)

Comments

Albert ARIBAUD Aug. 30, 2011, 8:11 a.m. UTC | #1 
Hi Stefano,

Le 30/08/2011 09:24, Stefano Babic a écrit :
> CONFIG_ARCH_VERSATILE_PB  is defined twice - drop
> the define from config.h.
>
> Signed-off-by: Stefano Babic<sbabic@denx.de>
> ---
>   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,
diff mbox

Patch

diff --git a/boards.cfg b/boards.cfg
index c31114d..198619d 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -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
diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index 32cee82..3bfcdff 100644
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -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)