diff --git a/config/boards/armsom-cm5-io.csc b/config/boards/armsom-cm5-io.csc
index ec704cd443..5b955641c9 100644
--- a/config/boards/armsom-cm5-io.csc
+++ b/config/boards/armsom-cm5-io.csc
@@ -10,12 +10,6 @@ BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
 BOARD_MAINTAINER=""
 
-function post_family_config_branch_vendor__armsom-cm5-io_use_vendor_uboot() {
-	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
-
-	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
-}
-
 function post_family_tweaks__armsom-cm5-io_naming_audios() {
 	display_alert "$BOARD" "Renaming armsom-cm5 audios" "info"
 
diff --git a/config/boards/armsom-cm5-rpi-cm4-io.csc b/config/boards/armsom-cm5-rpi-cm4-io.csc
index d130455a00..e462fc94a1 100644
--- a/config/boards/armsom-cm5-rpi-cm4-io.csc
+++ b/config/boards/armsom-cm5-rpi-cm4-io.csc
@@ -10,12 +10,6 @@ BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
 BOARD_MAINTAINER=""
 
-function post_family_config_branch_vendor__armsom-cm5-rpi-cm4-io_use_vendor_uboot() {
-	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
-
-	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
-}
-
 function post_family_tweaks__armsom-cm5-rpi-cm4-io_naming_audios() {
 	display_alert "$BOARD" "Renaming armsom-cm5-rpi-cm4-io audios" "info"
 
diff --git a/config/boards/armsom-sige5.csc b/config/boards/armsom-sige5.csc
index 370f88a0f1..629028fa2b 100644
--- a/config/boards/armsom-sige5.csc
+++ b/config/boards/armsom-sige5.csc
@@ -10,12 +10,6 @@ BOOT_SCENARIO="spl-blobs"
 IMAGE_PARTITION_TABLE="gpt"
 BOARD_MAINTAINER=""
 
-function post_family_config_branch_vendor__armsom-sige7_use_vendor_uboot() {
-	display_alert "$BOARD" "vendor u-boot overrides for $BOARD / $BRANCH" "info"
-
-	declare -g UBOOT_TARGET_MAP="BL31=$RKBIN_DIR/$BL31_BLOB TEE=$RKBIN_DIR/$BL32_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb"
-}
-
 function post_family_tweaks__armsom-sige7_naming_audios() {
 	display_alert "$BOARD" "Renaming armsom-sige7 audios" "info"
 
diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc
index b35a641891..b669a6280e 100644
--- a/config/sources/families/include/rockchip64_common.inc
+++ b/config/sources/families/include/rockchip64_common.inc
@@ -139,7 +139,6 @@ case "$BOOT_SOC" in
 		BOOT_SCENARIO="${BOOT_SCENARIO:=spl-blobs}"
 		DDR_BLOB="${DDR_BLOB:-"rk35/rk3576_ddr_lp4_2112MHz_lp5_2736MHz_v1.03.bin"}"
 		BL31_BLOB="${BL31_BLOB:-"rk35/rk3576_bl31_v1.04.elf"}"
-		BL32_BLOB="${BL32_BLOB:-"rk35/rk3576_bl32_v1.01.bin"}"
 		;;
 
 	rk3588) #CPUMAX undefined?
diff --git a/patch/u-boot/legacy/u-boot-radxa-rk35xx/rockchip-allow-passing-of-BL32-location-via-variable.patch b/patch/u-boot/legacy/u-boot-radxa-rk35xx/rockchip-allow-passing-of-BL32-location-via-variable.patch
deleted file mode 100644
index 1adbcac917..0000000000
--- a/patch/u-boot/legacy/u-boot-radxa-rk35xx/rockchip-allow-passing-of-BL32-location-via-variable.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/arch/arm/mach-rockchip/fit_nodes.sh b/arch/arm/mach-rockchip/fit_nodes.sh
-index 9639a06e1c..ceee0ccc20 100755
---- a/arch/arm/mach-rockchip/fit_nodes.sh
-+++ b/arch/arm/mach-rockchip/fit_nodes.sh
-@@ -180,7 +180,7 @@ function gen_bl32_node()
- 		fi
- 	fi
- 
--	TEE="tee.bin"
-+	TEE="${TEE:=tee.bin}"
- 	echo "		optee {
- 			description = \"OP-TEE\";
- 			data = /incbin/(\"${TEE}${SUFFIX}\");