Rename CONFIG_SYS_TEXT_BASE to CONFIG_TEXT_BASE
The current name is inconsistent with SPL which uses CONFIG_SPL_TEXT_BASE
and this makes it imposible to use CONFIG_VAL().
Rename it to resolve this problem.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/board/freescale/imx8qm_mek/uboot-container.cfg b/board/freescale/imx8qm_mek/uboot-container.cfg
index 93c5d39..e25aa76 100644
--- a/board/freescale/imx8qm_mek/uboot-container.cfg
+++ b/board/freescale/imx8qm_mek/uboot-container.cfg
@@ -9,4 +9,4 @@
SOC_TYPE IMX8QM
CONTAINER
IMAGE A35 bl31.bin 0x80000000
-IMAGE A35 u-boot.bin CONFIG_SYS_TEXT_BASE
+IMAGE A35 u-boot.bin CONFIG_TEXT_BASE
diff --git a/board/freescale/imx8qxp_mek/uboot-container.cfg b/board/freescale/imx8qxp_mek/uboot-container.cfg
index b53896f..b481c98 100644
--- a/board/freescale/imx8qxp_mek/uboot-container.cfg
+++ b/board/freescale/imx8qxp_mek/uboot-container.cfg
@@ -9,4 +9,4 @@
SOC_TYPE IMX8QX
CONTAINER
IMAGE A35 bl31.bin 0x80000000
-IMAGE A35 u-boot.bin CONFIG_SYS_TEXT_BASE
+IMAGE A35 u-boot.bin CONFIG_TEXT_BASE
diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c
index f016088..245c9df 100644
--- a/board/freescale/ls1021atsn/ls1021atsn.c
+++ b/board/freescale/ls1021atsn/ls1021atsn.c
@@ -188,7 +188,7 @@
* in last boot.
*/
if (is_warm_boot()) {
- second_uboot = (void (*)(void))CONFIG_SYS_TEXT_BASE;
+ second_uboot = (void (*)(void))CONFIG_TEXT_BASE;
second_uboot();
}
diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c
index 746b35a..fa87df7 100644
--- a/board/freescale/ls1021atwr/ls1021atwr.c
+++ b/board/freescale/ls1021atwr/ls1021atwr.c
@@ -439,7 +439,7 @@
* in last boot.
*/
if (is_warm_boot()) {
- second_uboot = (void (*)(void))CONFIG_SYS_TEXT_BASE;
+ second_uboot = (void (*)(void))CONFIG_TEXT_BASE;
second_uboot();
}
diff --git a/board/freescale/ls1028a/Kconfig b/board/freescale/ls1028a/Kconfig
index 5c27f0f..7d73d20 100644
--- a/board/freescale/ls1028a/Kconfig
+++ b/board/freescale/ls1028a/Kconfig
@@ -15,7 +15,7 @@
config EMMC_BOOT
bool "Support for booting from EMMC"
-config SYS_TEXT_BASE
+config TEXT_BASE
default 0x96000000 if SD_BOOT || EMMC_BOOT
default 0x82000000 if TFABOOT
default 0x20100000
@@ -51,7 +51,7 @@
config EMMC_BOOT
bool "Support for booting from EMMC"
-config SYS_TEXT_BASE
+config TEXT_BASE
default 0x96000000 if SD_BOOT || EMMC_BOOT
default 0x82000000 if TFABOOT
default 0x20100000