diff options
| author | Tom Rini <trini@konsulko.com> | 2022-11-10 10:09:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-11-10 10:09:40 -0500 |
| commit | 0cbeed4f6648e0e4966475e3544280a69ecb59d3 (patch) | |
| tree | a7b4b6b44bc3d43628e654f0c75ef2fab49ffd1b /board/freescale/common/arm_sleep.c | |
| parent | 77b5cc2948f5d93fe3d275302f596ffd8701a875 (diff) | |
| parent | cc1159bbfa94a60e4180846e480b887cf91fa722 (diff) | |
Merge branch '2022-11-10-symbol-migrations'
- Migrate a number of CONFIG symbols to Kconfig and start migrating some
symbol families from CONFIG to the CFG namespace.
Diffstat (limited to 'board/freescale/common/arm_sleep.c')
| -rw-r--r-- | board/freescale/common/arm_sleep.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/board/freescale/common/arm_sleep.c b/board/freescale/common/arm_sleep.c index 733940860f5..f5bed6c35bb 100644 --- a/board/freescale/common/arm_sleep.c +++ b/board/freescale/common/arm_sleep.c @@ -35,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; @@ -57,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]); @@ -71,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; @@ -114,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; |