global: Migrate CONFIG_ARM_GIC_BASE_ADDRESS to CFG

Perform a simple rename of CONFIG_ARM_GIC_BASE_ADDRESS to CFG_ARM_GIC_BASE_ADDRESS

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/cpu/armv7/nonsec_virt.S b/arch/arm/cpu/armv7/nonsec_virt.S
index 5ee6577c2c3c8e69c02e4d7071705396a9581449..a303039ba50f40446f0a5e4a1bf13376a8741a7b 100644 (file)
--- 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 5ffeca13d91341d5e2b40f03f44b0076a7b990bb..c82b215b6f9cb267e3ffb0c73d6f0d8d48216827 100644 (file)
--- 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 7a244769e30a3ef687f9021924bf86f7da6d2f2d..8acc525b11c956420a4f4b3bfde193bf0673935d 100644 (file)
--- 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 */