global: Migrate CONFIG_SYS_FSL* symbols to the CFG_SYS namespace

[platform/kernel/u-boot.git] / board / freescale / common / arm_sleep.c

diff --git a/board/freescale/common/arm_sleep.c b/board/freescale/common/arm_sleep.c
index bb1ef99..f5bed6c 100644 (file)
--- a/board/freescale/common/arm_sleep.c
+++ b/board/freescale/common/arm_sleep.c
@@ -5,6 +5,7 @@
 
 #include <common.h>
 #include <log.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
 #ifndef CONFIG_ARMV7_NONSEC
 #error " Deep sleep needs non-secure mode support. "
@@ -34,7 +35,7 @@ void __weak board_sleep_prepare(void)
 
 bool is_warm_boot(void)
 {
-       struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR;
+       struct ccsr_gur __iomem *gur = (void *)CFG_SYS_FSL_GUTS_ADDR;
 
        if (in_be32(&gur->crstsr) & DCFG_CCSR_CRSTSR_WDRFR)
                return 1;
@@ -56,7 +57,7 @@ static void dp_ddr_restore(void)
 {
        u64 *src, *dst;
        int i;
-       struct ccsr_scfg __iomem *scfg = (void *)CONFIG_SYS_FSL_SCFG_ADDR;
+       struct ccsr_scfg __iomem *scfg = (void *)CFG_SYS_FSL_SCFG_ADDR;
 
        /* get the address of ddr date from SPARECR3 */
        src = (u64 *)in_le32(&scfg->sparecr[2]);
@@ -70,7 +71,7 @@ static void dp_ddr_restore(void)
 void ls1_psci_resume_fixup(void)
 {
        u32 tmp;
-       struct ccsr_scfg __iomem *scfg = (void *)CONFIG_SYS_FSL_SCFG_ADDR;
+       struct ccsr_scfg __iomem *scfg = (void *)CFG_SYS_FSL_SCFG_ADDR;
 
 #ifdef QIXIS_BASE
        void *qixis_base = (void *)QIXIS_BASE;
@@ -113,7 +114,7 @@ int fsl_dp_resume(void)
 {
        u32 start_addr;
        void (*kernel_resume)(void);
-       struct ccsr_scfg __iomem *scfg = (void *)CONFIG_SYS_FSL_SCFG_ADDR;
+       struct ccsr_scfg __iomem *scfg = (void *)CFG_SYS_FSL_SCFG_ADDR;
 
        if (!is_warm_boot())
                return 0;