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 <sbabic@denx.de>

diff --git a/boards.cfg b/boards.cfg
index abee8211eae065ce33890acb4e682a6774f83232..413ab9244d2b97781c54029569851416da76e086 100644 (file)
--- 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 32cee824bb64132a1de1b2e5d14b9a2d4f40a407..3bfcdffb90b288409a825f7e84ef160b85ff818c 100644 (file)
--- 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)