| Message ID | 20210910061919.522-2-kristian.amlie@northern.tech |
|---|---|
| State | Accepted |
| Commit | 8a0f5f6e70b32f04bd0a3eb845df7c55a3690e3b |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/1] Avoid polluting CONFIG_ namespace with board specific define. | expand |
On Fri, Sep 10, 2021 at 08:19:19AM +0200, Kristian Amlie wrote: > Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech> Reviewed-by: Tom Rini <trini@konsulko.com>
On Fri, Sep 10, 2021 at 08:19:19AM +0200, Kristian Amlie wrote: > Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/next, thanks!
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 99a5dd064a..f3f021f050 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 d86f35856f..8afdee6499 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3441,7 +3441,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
Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech> --- include/configs/vexpress_ca9x4.h | 2 +- include/configs/vexpress_common.h | 2 +- scripts/config_whitelist.txt | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)