diff --git a/config/boards/helios64.csc b/config/boards/helios64.csc
index 19001b7b0e..e42828bd7e 100644
--- a/config/boards/helios64.csc
+++ b/config/boards/helios64.csc
@@ -3,7 +3,7 @@ BOARD_NAME="Helios64"
 BOARDFAMILY="rk3399"
 BOOTCONFIG="helios64-rk3399_defconfig"
 BOOT_SCENARIO="blobless"
-KERNEL_TARGET="legacy,current,edge"
+KERNEL_TARGET="current,edge"
 MODULES="lm75 ledtrig-netdev"
 MODULES_LEGACY="lm75"
 FULL_DESKTOP="yes"
diff --git a/config/boards/nanopineo.conf b/config/boards/nanopineo.conf
index 6e82649da9..26104c20d1 100644
--- a/config/boards/nanopineo.conf
+++ b/config/boards/nanopineo.conf
@@ -9,7 +9,3 @@ DEFAULT_CONSOLE="serial"
 SERIALCON="ttyS0,ttyGS0"
 HAS_VIDEO_OUTPUT="no"
 KERNEL_TARGET="legacy,current,edge"
-
-# Using older u-boot for this board
-BOOTBRANCH_BOARD="tag:v2022.04"
-BOOTPATCHDIR="u-boot-sunxi-v2022.04"
diff --git a/config/boards/orangepiplus2e.conf b/config/boards/orangepiplus2e.conf
index 52893c6b2d..1afc8381f0 100644
--- a/config/boards/orangepiplus2e.conf
+++ b/config/boards/orangepiplus2e.conf
@@ -5,10 +5,6 @@ BOOTCONFIG="orangepi_plus2e_defconfig"
 KERNEL_TARGET="legacy,current,edge"
 FULL_DESKTOP="yes"
 
-# newer uboot for this board
-BOOTBRANCH_BOARD="tag:v2023.04"
-BOOTPATCHDIR="u-boot-sunxi-v2023.04"
-
 function post_family_tweaks_bsp__orangepiplus2e_BSP() {
 	display_alert "Installing BSP firmware and fixups"
 
diff --git a/patch/atf/atf-sunxi64/board_pine64so/set-lpddr3-dram-voltage.patch b/patch/atf/atf-sunxi64/board_pine64so/set-lpddr3-dram-voltage.patch.disabled
similarity index 100%
rename from patch/atf/atf-sunxi64/board_pine64so/set-lpddr3-dram-voltage.patch
rename to patch/atf/atf-sunxi64/board_pine64so/set-lpddr3-dram-voltage.patch.disabled
diff --git a/patch/u-boot/u-boot-sunxi/board_orangepizeroplus2-h3/add-orangepi-zeroplus2_h3.patch b/patch/u-boot/u-boot-sunxi/board_orangepizeroplus2-h3/add-orangepi-zeroplus2_h3.patch
index aac97e2166..189a91350d 100644
--- a/patch/u-boot/u-boot-sunxi/board_orangepizeroplus2-h3/add-orangepi-zeroplus2_h3.patch
+++ b/patch/u-boot/u-boot-sunxi/board_orangepizeroplus2-h3/add-orangepi-zeroplus2_h3.patch
@@ -196,7 +196,7 @@ new file mode 100644
 index 0000000000..9257b7c1ed
 --- /dev/null
 +++ b/configs/orangepi_zero_plus2_h3_defconfig
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,22 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_SUNXI=y
 +CONFIG_SYS_TEXT_BASE=0x4a000000
@@ -210,6 +210,8 @@ index 0000000000..9257b7c1ed
 +CONFIG_SPL=y
 +CONFIG_SPL_SPI_FLASH_SUPPORT=y
 +CONFIG_SPL_SPI_SUNXI=y
++CONFIG_SPL_STACK=0x8000
++CONFIG_SYS_PBSIZE=1024
 +# CONFIG_CMD_IMLS is not set
 +# CONFIG_CMD_FLASH is not set
 +# CONFIG_CMD_FPGA is not set
diff --git a/patch/u-boot/u-boot-sunxi/board_sunvell-r69/add-sunvell-r69.patch b/patch/u-boot/u-boot-sunxi/board_sunvell-r69/add-sunvell-r69.patch
index e2a8c5f8d4..f8af76185d 100644
--- a/patch/u-boot/u-boot-sunxi/board_sunvell-r69/add-sunvell-r69.patch
+++ b/patch/u-boot/u-boot-sunxi/board_sunvell-r69/add-sunvell-r69.patch
@@ -351,10 +351,12 @@ new file mode 100644
 index 0000000000..d03dcec8d0
 --- /dev/null
 +++ b/configs/sunvell_r69_defconfig
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,22 @@
 +CONFIG_ARM=y
 +CONFIG_ARCH_SUNXI=y
 +CONFIG_SPL=y
++CONFIG_SPL_STACK=0x8000
++CONFIG_SYS_PBSIZE=1024
 +CONFIG_MACH_SUN8I_H3=y
 +CONFIG_DRAM_CLK=408
 +CONFIG_DRAM_ZQ=3881979