summaryrefslogtreecommitdiff
path: root/arch/arm/cpu
diff options
context:
space:
mode:
authorYork Sun <york.sun@nxp.com>2016-09-26 08:09:30 -0700
committerYork Sun <york.sun@nxp.com>2016-09-26 08:53:07 -0700
commit295a24b3d6a751b79373e7ff2199d91765cae8a9 (patch)
tree13c19483c6ddfce5b37fa30d64460c16a5b6bd7d /arch/arm/cpu
parent5e8bd7e117157eee591e377c80e024f12318cf9d (diff)
downloadu-boot-imx-295a24b3d6a751b79373e7ff2199d91765cae8a9.zip
u-boot-imx-295a24b3d6a751b79373e7ff2199d91765cae8a9.tar.gz
u-boot-imx-295a24b3d6a751b79373e7ff2199d91765cae8a9.tar.bz2
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>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r--arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c b/arch/arm/cpu/armv7/ls102xa/ls102xa_psci.c
index 2ac2e6c..1cbe93c 100644
--- 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;