[PoC 064/241] global: Migrate CONFIG_IRAM_BASE to CFG

Tom Rini
2022-11-20T13:53:16Z

arch/arm/include/asm/arch-rockchip/bootrom.h | 2 +-
include/configs/exynos7420-common.h | 4 ++--
include/configs/px30_common.h | 2 +-
include/configs/rk3066_common.h | 2 +-
include/configs/rk3128_common.h | 2 +-
include/configs/rk3188_common.h | 2 +-
include/configs/rk322x_common.h | 2 +-
include/configs/rk3288_common.h | 2 +-
include/configs/rk3308_common.h | 2 +-
include/configs/rk3328_common.h | 2 +-
include/configs/rk3368_common.h | 2 +-
include/configs/rk3399_common.h | 2 +-
include/configs/rk3568_common.h | 2 +-
include/configs/rv1108_common.h | 2 +-
scripts/config_whitelist.txt | 2 +-
15 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/arch/arm/include/asm/arch-rockchip/bootrom.h b/arch/arm/include/asm/arch-rockchip/bootrom.h
index 0da78f30b619..4276a0f6811a 100644
--- a/arch/arm/include/asm/arch-rockchip/bootrom.h
+++ b/arch/arm/include/asm/arch-rockchip/bootrom.h
@@ -57,6 +57,6 @@ extern const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1];
/**
* Locations of the boot-device identifier in SRAM
*/
-#define BROM_BOOTSOURCE_ID_ADDR (CONFIG_IRAM_BASE + 0x10)
+#define BROM_BOOTSOURCE_ID_ADDR (CFG_IRAM_BASE + 0x10)

#endif
diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h
index c8408eb39200..937a3c8820c1 100644
--- a/include/configs/exynos7420-common.h
+++ b/include/configs/exynos7420-common.h
@@ -16,9 +16,9 @@
/* select serial console configuration */

/* IRAM Layout */
-#define CONFIG_IRAM_BASE 0x02100000
+#define CFG_IRAM_BASE 0x02100000
#define CONFIG_IRAM_SIZE 0x58000
-#define CONFIG_IRAM_END (CONFIG_IRAM_BASE + CONFIG_IRAM_SIZE)
+#define CONFIG_IRAM_END (CFG_IRAM_BASE + CONFIG_IRAM_SIZE)
#define CPU_RELEASE_ADDR secondary_boot_addr

/* select serial console configuration */
diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h
index 003686930a4b..3f1595cdc95f 100644
--- a/include/configs/px30_common.h
+++ b/include/configs/px30_common.h
@@ -9,7 +9,7 @@
#include "rockchip-common.h"

/* FIXME: ff020000 is pmu_mem (10k), while ff0e0000 is regular int_mem */
-#define CONFIG_IRAM_BASE 0xff020000
+#define CFG_IRAM_BASE 0xff020000

#define GICD_BASE 0xff131000
#define GICC_BASE 0xff132000
diff --git a/include/configs/rk3066_common.h b/include/configs/rk3066_common.h
index c4758e148ba7..1a6d3678df3e 100644
--- a/include/configs/rk3066_common.h
+++ b/include/configs/rk3066_common.h
@@ -9,7 +9,7 @@
#include <asm/arch-rockchip/hardware.h>
#include "rockchip-common.h"

-#define CONFIG_IRAM_BASE 0x10080000
+#define CFG_IRAM_BASE 0x10080000

#define CFG_SYS_SDRAM_BASE 0x60000000
#define SDRAM_BANK_SIZE (1024UL << 20UL)
diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h
index 5b0ec3700040..8aa17bfbd364 100644
--- a/include/configs/rk3128_common.h
+++ b/include/configs/rk3128_common.h
@@ -10,7 +10,7 @@

#define CFG_SYS_HZ_CLOCK 24000000

-#define CONFIG_IRAM_BASE 0x10080000
+#define CFG_IRAM_BASE 0x10080000

/* RAW SD card / eMMC locations. */

diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h
index 58f491c2f320..ac9195672fb7 100644
--- a/include/configs/rk3188_common.h
+++ b/include/configs/rk3188_common.h
@@ -9,7 +9,7 @@
#include <asm/arch-rockchip/hardware.h>
#include "rockchip-common.h"

-#define CONFIG_IRAM_BASE 0x10080000
+#define CFG_IRAM_BASE 0x10080000

/* spl size 32kb sram - 2kb bootrom */

diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h
index b95268df87c2..fcaf9c52c4be 100644
--- a/include/configs/rk322x_common.h
+++ b/include/configs/rk322x_common.h
@@ -10,7 +10,7 @@

#define CFG_SYS_HZ_CLOCK 24000000

-#define CONFIG_IRAM_BASE 0x10080000
+#define CFG_IRAM_BASE 0x10080000

#define CFG_SYS_SDRAM_BASE 0x60000000
#define SDRAM_BANK_SIZE (512UL << 20UL)
diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h
index d3b8a5150f6b..5f29432be10b 100644
--- a/include/configs/rk3288_common.h
+++ b/include/configs/rk3288_common.h
@@ -11,7 +11,7 @@

#define CFG_SYS_HZ_CLOCK 24000000

-#define CONFIG_IRAM_BASE 0xff700000
+#define CFG_IRAM_BASE 0xff700000

/* RAW SD card / eMMC locations. */

diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h
index bc03e113fef0..55a0dfecb21b 100644
--- a/include/configs/rk3308_common.h
+++ b/include/configs/rk3308_common.h
@@ -8,7 +8,7 @@

#include "rockchip-common.h"

-#define CONFIG_IRAM_BASE 0xfff80000
+#define CFG_IRAM_BASE 0xfff80000

#define CFG_SYS_SDRAM_BASE 0
#define SDRAM_MAX_SIZE 0xff000000
diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
index 85d2186f23e0..fadcb93a5f7e 100644
--- a/include/configs/rk3328_common.h
+++ b/include/configs/rk3328_common.h
@@ -8,7 +8,7 @@

#include "rockchip-common.h"

-#define CONFIG_IRAM_BASE 0xff090000
+#define CFG_IRAM_BASE 0xff090000

/* FAT sd card locations. */
#define CFG_SYS_SDRAM_BASE 0
diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h
index 17636250510b..9aa256b59592 100644
--- a/include/configs/rk3368_common.h
+++ b/include/configs/rk3368_common.h
@@ -14,7 +14,7 @@
#define CFG_SYS_SDRAM_BASE 0
#define SDRAM_MAX_SIZE 0xff000000

-#define CONFIG_IRAM_BASE 0xff8c0000
+#define CFG_IRAM_BASE 0xff8c0000

#define ENV_MEM_LAYOUT_SETTINGS \
"scriptaddr=0x00500000\0" \
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
index 43066933d02f..9512cfdcd2d5 100644
--- a/include/configs/rk3399_common.h
+++ b/include/configs/rk3399_common.h
@@ -8,7 +8,7 @@

#include "rockchip-common.h"

-#define CONFIG_IRAM_BASE 0xff8c0000
+#define CFG_IRAM_BASE 0xff8c0000

#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_TPL_BOOTROM_SUPPORT)
#else
diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h
index 750f16d03999..ae360105d508 100644
--- a/include/configs/rk3568_common.h
+++ b/include/configs/rk3568_common.h
@@ -8,7 +8,7 @@

#include "rockchip-common.h"

-#define CONFIG_IRAM_BASE 0xfdcc0000
+#define CFG_IRAM_BASE 0xfdcc0000

#define CFG_SYS_SDRAM_BASE 0
#define SDRAM_MAX_SIZE 0xf0000000
diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h
index 6e17b23b624c..63551b47e200 100644
--- a/include/configs/rv1108_common.h
+++ b/include/configs/rv1108_common.h
@@ -8,7 +8,7 @@
#include <asm/arch-rockchip/hardware.h>
#include "rockchip-common.h"

-#define CONFIG_IRAM_BASE 0x10080000
+#define CFG_IRAM_BASE 0x10080000

#define CFG_SYS_TIMER_RATE (24 * 1000 * 1000)
/* TIMER1,initialized by ddr initialize code */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9e927d81200a..ccc719a3b985 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -66,7 +66,7 @@ CFG_I2C_RTC_ADDR
CFG_ICS307_REFCLK_HZ
CFG_IMX6_PWM_PER_CLK
CFG_IPADDR
-CONFIG_IRAM_BASE
+CFG_IRAM_BASE
CONFIG_IRAM_END
CONFIG_IRAM_SIZE
CONFIG_IRAM_TOP
--
2.25.1