From 96c9745fa1f03a0e24d09a32344a1f0c821bc9af Mon Sep 17 00:00:00 2001 From: Stefano Babic <sbabic@denx.de> Date: Mon, 29 Aug 2011 21:24:27 +0000 Subject: [PATCH] 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> --- boards.cfg | 2 +- include/configs/versatile.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/boards.cfg b/boards.cfg index abee8211eae..413ab9244d2 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 32cee824bb6..3bfcdffb90b 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) -- GitLab