[PoC 067/241] global: Migrate CONFIG_IRAM_TOP to CFG

Tom Rini trini at konsulko.com
Sun Nov 20 14:30:58 CET 2022


Signed-off-by: Tom Rini <trini at konsulko.com>
---
 arch/arm/mach-exynos/lowlevel_init.c | 2 +-
 arch/arm/mach-exynos/sec_boot.S      | 2 +-
 include/configs/exynos5420-common.h  | 2 +-
 scripts/config_whitelist.txt         | 2 +-
 4 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 1ff5fcac1b38..9225d2cc1f2a 100644
--- a/arch/arm/mach-exynos/lowlevel_init.c
+++ b/arch/arm/mach-exynos/lowlevel_init.c
@@ -51,7 +51,7 @@ enum {
 #ifdef CONFIG_EXYNOS5420
 
 /* Address for relocating helper code (Last 4 KB of IRAM) */
-#define EXYNOS_RELOCATE_CODE_BASE	(CONFIG_IRAM_TOP - 0x1000)
+#define EXYNOS_RELOCATE_CODE_BASE	(CFG_IRAM_TOP - 0x1000)
 
 /*
  * Power up secondary CPUs.
diff --git a/arch/arm/mach-exynos/sec_boot.S b/arch/arm/mach-exynos/sec_boot.S
index 40c07209e475..1303544d83b6 100644
--- a/arch/arm/mach-exynos/sec_boot.S
+++ b/arch/arm/mach-exynos/sec_boot.S
@@ -21,7 +21,7 @@ relocate_wait_code:
 	.ltorg
 /*
  * Secondary core waits here until Primary wake it up.
- * Below code is copied to (CONFIG_IRAM_TOP - 0x1000)
+ * Below code is copied to (CFG_IRAM_TOP - 0x1000)
  * This is a workaround code which is supposed to act as a
  * substitute/supplement to the iROM code.
  *
diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index 7a9307ccc3db..d5f480de0ef7 100644
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -10,7 +10,7 @@
 
 #define CONFIG_VAR_SIZE_SPL
 
-#define CONFIG_IRAM_TOP			0x02074000
+#define CFG_IRAM_TOP			0x02074000
 
 #define CONFIG_PHY_IRAM_BASE		0x02020000
 
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 249ec5090b8a..d2683e317bd6 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -69,7 +69,7 @@ CFG_IPADDR
 CFG_IRAM_BASE
 CFG_IRAM_END
 CFG_IRAM_SIZE
-CONFIG_IRAM_TOP
+CFG_IRAM_TOP
 CONFIG_KM_DEF_ARCH
 CONFIG_KM_DEF_BOOT_ARGS_CPU
 CONFIG_KM_DEF_ENV
-- 
2.25.1



More information about the U-Boot mailing list