[PoC 001/241] global: Migrate CONFIG_ARM_GIC_BASE_ADDRESS to CFG

Tom Rini
2022-11-20T13:34:26Z

arch/arm/cpu/armv7/nonsec_virt.S | 4 ++--
arch/arm/cpu/armv7/virt-v7.c | 4 ++--
include/configs/arndale.h | 2 +-
scripts/config_whitelist.txt | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
index 39aeeb423f08..b6d144f065d2 100644
--- a/arch/arm/cpu/armv7/nonsec_virt.S
+++ b/arch/arm/cpu/armv7/nonsec_virt.S
@@ -112,8 +112,8 @@ ENTRY(_do_nonsec_entry)
ENDPROC(_do_nonsec_entry)

.macro get_cbar_addr addr
-#ifdef CONFIG_ARM_GIC_BASE_ADDRESS
- ldr \addr, =CONFIG_ARM_GIC_BASE_ADDRESS
+#ifdef CFG_ARM_GIC_BASE_ADDRESS
+ ldr \addr, =CFG_ARM_GIC_BASE_ADDRESS
#else
mrc p15, 4, \addr, c15, c0, 0 @ read CBAR
bfc \addr, #0, #15 @ clear reserved bits
diff --git a/arch/arm/cpu/armv7/virt-v7.c b/arch/arm/cpu/armv7/virt-v7.c
index 5ffeca13d913..c82b215b6f9c 100644
--- a/arch/arm/cpu/armv7/virt-v7.c
+++ b/arch/arm/cpu/armv7/virt-v7.c
@@ -26,8 +26,8 @@ static unsigned int read_id_pfr1(void)

static unsigned long get_gicd_base_address(void)
{
-#ifdef CONFIG_ARM_GIC_BASE_ADDRESS
- return CONFIG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET;
+#ifdef CFG_ARM_GIC_BASE_ADDRESS
+ return CFG_ARM_GIC_BASE_ADDRESS + GIC_DIST_OFFSET;
#else
unsigned periphbase;

diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index 7a244769e30a..8acc525b11c9 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -19,6 +19,6 @@
#define CONFIG_SMP_PEN_ADDR 0x02020000

/* The PERIPHBASE in the CBAR register is wrong on the Arndale, so override it */
-#define CONFIG_ARM_GIC_BASE_ADDRESS 0x10480000
+#define CFG_ARM_GIC_BASE_ADDRESS 0x10480000

#endif /* __CONFIG_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 39e1071236bd..0d2cbddeed40 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1,4 +1,4 @@
-CONFIG_ARM_GIC_BASE_ADDRESS
+CFG_ARM_GIC_BASE_ADDRESS
CONFIG_BOARDDIR
CONFIG_DFU_ALT
CONFIG_DFU_ALT_BOOT_EMMC
--
2.25.1