From 8a0f5f6e70b32f04bd0a3eb845df7c55a3690e3b Mon Sep 17 00:00:00 2001 From: Kristian Amlie Date: Fri, 10 Sep 2021 08:19:19 +0200 Subject: [PATCH] Avoid polluting CONFIG_ namespace with board specific define. Signed-off-by: Kristian Amlie Reviewed-by: Tom Rini --- include/configs/vexpress_ca9x4.h | 2 +- include/configs/vexpress_common.h | 2 +- scripts/config_whitelist.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h index 8157a5868d..ba3f9797a5 100644 --- 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 46565db151..02fd963611 100644 --- 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 bf7a7d39f6..0fab768713 100644 --- 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 -- 2.39.5