diff options
| author | Stefano Babic <sbabic@denx.de> | 2011-08-29 21:24:27 +0000 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2011-09-04 11:36:06 +0200 |
| commit | 96c9745fa1f03a0e24d09a32344a1f0c821bc9af (patch) | |
| tree | 1eee678a0c38bedc2c7d309522dce6ea35f8c644 | |
| parent | f89f6109e977cb1aea8cee69b384ed622c2f8549 (diff) | |
| download | blackbird-obmc-uboot-96c9745fa1f03a0e24d09a32344a1f0c821bc9af.tar.gz blackbird-obmc-uboot-96c9745fa1f03a0e24d09a32344a1f0c821bc9af.zip | |
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>
| -rw-r--r-- | boards.cfg | 2 | ||||
| -rw-r--r-- | include/configs/versatile.h | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/boards.cfg b/boards.cfg index abee8211ea..413ab9244d 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 32cee824bb..3bfcdffb90 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) |
