diff --git a/projects/Allwinner/patches/u-boot/0003-sunxi-binman-Enable-SPL-FIT-loading-for-32-bit-SoCs.patch b/projects/Allwinner/patches/u-boot/0003-sunxi-binman-Enable-SPL-FIT-loading-for-32-bit-SoCs.patch
index 01984f8b66..06221c93db 100644
--- a/projects/Allwinner/patches/u-boot/0003-sunxi-binman-Enable-SPL-FIT-loading-for-32-bit-SoCs.patch
+++ b/projects/Allwinner/patches/u-boot/0003-sunxi-binman-Enable-SPL-FIT-loading-for-32-bit-SoCs.patch
@@ -90,8 +90,8 @@ index 4a6ed3a7dd5c..ad1f97632979 100644
 -					arch = "arm64";
 +					arch = ARCH;
  					compression = "none";
- 					load = <CONFIG_SYS_TEXT_BASE>;
-+					entry = <CONFIG_SYS_TEXT_BASE>;
+ 					load = <CONFIG_TEXT_BASE>;
++					entry = <CONFIG_TEXT_BASE>;
  
  					u-boot-nodtb {
  					};
diff --git a/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch
index 5878cd358d..dcf99b2f34 100644
--- a/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch
+++ b/projects/Amlogic/patches/u-boot/u-boot-0008-WIP-boards-amlogic-add-WeTek-Hub-defconfig.patch
@@ -18,7 +18,7 @@ index 0000000000..9ad263ca2c
 +CONFIG_ARM=y
 +CONFIG_SYS_BOARD="wetek-gxbb"
 +CONFIG_ARCH_MESON=y
-+CONFIG_SYS_TEXT_BASE=0x01000000
++CONFIG_TEXT_BASE=0x01000000
 +CONFIG_SYS_LOAD_ADDR=0x1000000
 +CONFIG_NR_DRAM_BANKS=1
 +CONFIG_ENV_SIZE=0x2000
diff --git a/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch
index a190d14225..a6f55080c2 100644
--- a/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch
+++ b/projects/Amlogic/patches/u-boot/u-boot-0009-WIP-boards-amlogic-add-WeTek-Play2-defconfig.patch
@@ -18,7 +18,7 @@ index 0000000000..624679f90c
 +CONFIG_ARM=y
 +CONFIG_SYS_BOARD="wetek-gxbb"
 +CONFIG_ARCH_MESON=y
-+CONFIG_SYS_TEXT_BASE=0x01000000
++CONFIG_TEXT_BASE=0x01000000
 +CONFIG_SYS_LOAD_ADDR=0x1000000
 +CONFIG_NR_DRAM_BANKS=1
 +CONFIG_ENV_SIZE=0x2000
diff --git a/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch
index 545452811f..b1d9d5550d 100644
--- a/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch
+++ b/projects/Amlogic/patches/u-boot/u-boot-0011-WIP-boards-amlogic-add-Radxa-Zero2-defconfig.patch
@@ -30,7 +30,7 @@ index 0000000000..3ef3c9c143
 @@ -0,0 +1,77 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_MESON=y
-+CONFIG_SYS_TEXT_BASE=0x01000000
++CONFIG_TEXT_BASE=0x01000000
 +CONFIG_NR_DRAM_BANKS=1
 +CONFIG_ENV_SIZE=0x2000
 +CONFIG_DM_GPIO=y
diff --git a/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch b/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch
index ea69b977e3..5dc514487b 100644
--- a/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch
+++ b/projects/Amlogic/patches/u-boot/u-boot-0014-WIP-boards-amlogic-add-Beelink-GT1-defconfig.patch
@@ -19,7 +19,7 @@ index 0000000000..77ffc9aa49
 @@ -0,0 +1,71 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_MESON=y
-+CONFIG_SYS_TEXT_BASE=0x01000000
++CONFIG_TEXT_BASE=0x01000000
 +CONFIG_NR_DRAM_BANKS=1
 +CONFIG_ENV_SIZE=0x2000
 +CONFIG_DM_GPIO=y
diff --git a/projects/Rockchip/devices/RK3288/bootloader/config b/projects/Rockchip/devices/RK3288/bootloader/config
index 48779ace61..17f6fe7324 100644
--- a/projects/Rockchip/devices/RK3288/bootloader/config
+++ b/projects/Rockchip/devices/RK3288/bootloader/config
@@ -18,4 +18,4 @@ CONFIG_ROCKCHIP_EFUSE=y
 CONFIG_SHA256=y
 CONFIG_TPL=y
 CONFIG_SPL_SIZE_LIMIT=0x4b000
-CONFIG_SYS_TEXT_BASE=0x01000000
+CONFIG_TEXT_BASE=0x01000000
diff --git a/projects/Samsung/patches/u-boot/u-boot-0001-add-xu4-defconfig.patch b/projects/Samsung/patches/u-boot/u-boot-0001-add-xu4-defconfig.patch
index d3a4bbdf72..aaf8671494 100644
--- a/projects/Samsung/patches/u-boot/u-boot-0001-add-xu4-defconfig.patch
+++ b/projects/Samsung/patches/u-boot/u-boot-0001-add-xu4-defconfig.patch
@@ -17,7 +17,7 @@ index 0000000000..097f03b243
 +CONFIG_ARM=y
 +CONFIG_ARCH_CPU_INIT=y
 +CONFIG_ARCH_EXYNOS=y
-+CONFIG_SYS_TEXT_BASE=0x43E00000
++CONFIG_TEXT_BASE=0x43E00000
 +CONFIG_ARCH_EXYNOS5=y
 +CONFIG_ENV_SIZE=0x4000
 +CONFIG_ENV_OFFSET=0x310000