Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/mach-exynos/lowlevel_init.c | 4 ++-- include/configs/exynos5420-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-exynos/lowlevel_init.c b/arch/arm/mach-exynos/lowlevel_init.c index 02a79962af24..243b5c80c90e 100644 --- a/arch/arm/mach-exynos/lowlevel_init.c +++ b/arch/arm/mach-exynos/lowlevel_init.c @@ -73,7 +73,7 @@ static void low_power_start(void)
reg_val = readl(EXYNOS5420_SPARE_BASE); if (reg_val != CPU_RST_FLAG_VAL) { - writel(0x0, CONFIG_LOWPOWER_FLAG); + writel(0x0, CFG_LOWPOWER_FLAG); branch_bx(0x0); }
@@ -160,7 +160,7 @@ static void secondary_cores_configure(void) writel(0x0, (EXYNOS_RELOCATE_CODE_BASE + 0x1C));
/* set lowpower flag and address */ - writel(CPU_RST_FLAG_VAL, CONFIG_LOWPOWER_FLAG); + writel(CPU_RST_FLAG_VAL, CFG_LOWPOWER_FLAG); writel((uint32_t)&low_power_start, CFG_LOWPOWER_ADDR); writel(CPU_RST_FLAG_VAL, EXYNOS5420_SPARE_BASE); /* Store jump address for power down */ diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h index d7db17b2dc92..b617c062881b 100644 --- a/include/configs/exynos5420-common.h +++ b/include/configs/exynos5420-common.h @@ -17,7 +17,7 @@ /* * Low Power settings */ -#define CONFIG_LOWPOWER_FLAG 0x02020028 +#define CFG_LOWPOWER_FLAG 0x02020028 #define CFG_LOWPOWER_ADDR 0x0202002C
#endif /* __CONFIG_EXYNOS5420_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f2d7a0202c22..99942bf36472 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -100,7 +100,7 @@ CFG_L1_INIT_RAM CFG_L2_CACHE CFG_LEGACY_BOOTCMD_ENV CFG_LOWPOWER_ADDR -CONFIG_LOWPOWER_FLAG +CFG_LOWPOWER_FLAG CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY CONFIG_LPC32XX_NAND_MLC_NAND_TA CONFIG_LPC32XX_NAND_MLC_RD_HIGH