Avoid polluting CONFIG_ namespace with board specific define.

Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h
index 8157a58..ba3f979 100644 (file)
--- a/include/configs/vexpress_ca9x4.h
+++ b/include/configs/vexpress_ca9x4.h
@@ -10,7 +10,7 @@
 #ifndef __VEXPRESS_CA9X4_H
 #define __VEXPRESS_CA9X4_H
 
-#define CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
+#define VEXPRESS_ORIGINAL_MEMORY_MAP
 #include "vexpress_common.h"
 
 #endif /* VEXPRESS_CA9X4_H */

diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 46565db..02fd963 100644 (file)
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -15,7 +15,7 @@
  * Definitions copied from linux kernel:
  * arch/arm/mach-vexpress/include/mach/motherboard.h
  */
-#ifdef CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
+#ifdef VEXPRESS_ORIGINAL_MEMORY_MAP
 /* CS register bases for the original memory map. */
 #define V2M_PA_CS0             0x40000000
 #define V2M_PA_CS1             0x44000000

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index bf7a7d3..0fab768 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -3194,7 +3194,6 @@ CONFIG_U_BOOT_HDR_SIZE
 CONFIG_VAL
 CONFIG_VAR_SIZE_SPL
 CONFIG_VERY_BIG_RAM
-CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP
 CONFIG_VIDEO_BCM2835
 CONFIG_VIDEO_BMP_LOGO
 CONFIG_VIDEO_DA8XX