ARM: versatilepb : drop warnings due to double definitions
authorStefano Babic <sbabic@denx.de>
Mon, 29 Aug 2011 21:24:27 +0000 (21:24 +0000)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sun, 4 Sep 2011 09:36:06 +0000 (11:36 +0200)
CONFIG_ARCH_VERSATILE_PB  is defined twice - drop
the define from config.h.

Signed-off-by: Stefano Babic <sbabic@denx.de>
boards.cfg
include/configs/versatile.h

index abee821..413ab92 100644 (file)
@@ -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
index 32cee82..3bfcdff 100644 (file)
 #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)