armv7: ls102xa: Rename GIC_ADDR and DCSR_RCPM_ADDR

Instead of using CONFIG_* name space, rename these two macros to
SYS_FSL_* space.

Signed-off-by: York Sun <york.sun@nxp.com>
CC: Hongbo Zhang <hongbo.zhang@nxp.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c
index 2ac2e6c..1cbe93c 100644 (file)
--- a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c
+++ b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c
@@ -43,7 +43,7 @@ static void __secure ls1_save_ddr_head(void)
 static void __secure ls1_fsm_setup(void)
 {
        void *dcsr_epu_base = (void *)(CONFIG_SYS_DCSRBAR + EPU_BLOCK_OFFSET);
-       void *dcsr_rcpm_base = (void *)CONFIG_SYS_DCSR_RCPM_ADDR;
+       void *dcsr_rcpm_base = (void *)SYS_FSL_DCSR_RCPM_ADDR;
 
        out_be32(dcsr_rcpm_base + DCSR_RCPM_CSTTACR0, 0x00001001);
        out_be32(dcsr_rcpm_base + DCSR_RCPM_CG1CR0, 0x00000001);
@@ -112,7 +112,7 @@ static void __secure ls1_delay(unsigned int loop)
 static void __secure ls1_start_fsm(void)
 {
        void *dcsr_epu_base = (void *)(CONFIG_SYS_DCSRBAR + EPU_BLOCK_OFFSET);
-       void *ccsr_gic_base = (void *)CONFIG_SYS_GIC_ADDR;
+       void *ccsr_gic_base = (void *)SYS_FSL_GIC_ADDR;
        struct ccsr_scfg __iomem *scfg = (void *)CONFIG_SYS_FSL_SCFG_ADDR;
        struct ccsr_ddr __iomem *ddr = (void *)CONFIG_SYS_FSL_DDR_ADDR;
 

diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h
index 46de784..fab8774 100644 (file)
--- a/arch/arm/include/asm/arch-ls102xa/config.h
+++ b/arch/arm/include/asm/arch-ls102xa/config.h
@@ -16,9 +16,9 @@
 #define CONFIG_SYS_DCSRBAR                     0x20000000
 
 #define CONFIG_SYS_DCSR_DCFG_ADDR      (CONFIG_SYS_DCSRBAR + 0x00220000)
-#define CONFIG_SYS_DCSR_RCPM_ADDR      (CONFIG_SYS_DCSRBAR + 0x00222000)
+#define SYS_FSL_DCSR_RCPM_ADDR (CONFIG_SYS_DCSRBAR + 0x00222000)
 
-#define CONFIG_SYS_GIC_ADDR                    (CONFIG_SYS_IMMR + 0x00400000)
+#define SYS_FSL_GIC_ADDR                       (CONFIG_SYS_IMMR + 0x00400000)
 #define CONFIG_SYS_FSL_DDR_ADDR                        (CONFIG_SYS_IMMR + 0x00080000)
 #define CONFIG_SYS_CCI400_ADDR                 (CONFIG_SYS_IMMR + 0x00180000)
 #define CONFIG_SYS_FSL_CSU_ADDR                 (CONFIG_SYS_IMMR + 0x00510000)