diff --git a/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile b/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile
deleted file mode 100644
index 291630b96..000000000
--- a/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-#
-# Copyright (C) 2022 ImmortalWrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=arm-trusted-firmware-rockchip-vendor
-PKG_RELEASE:=$(AUTORELEASE)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/rockchip-linux/rkbin.git
-PKG_SOURCE_DATE:=2024-02-22
-PKG_SOURCE_VERSION:=a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0
-PKG_MIRROR_HASH:=ada1db5d73938c61847b3608844bb5a95d26a92574677e21322327d4438db19f
-
-PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
-
-MAKE_PATH:=$(PKG_NAME)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/arm-trusted-firmware-rockchip-vendor
-    SECTION:=boot
-    CATEGORY:=Boot Loaders
-    TITLE:=ARM Trusted Firmware for Rockchip
-endef
-
-define Package/arm-trusted-firmware-rk3328
-    $(Package/arm-trusted-firmware-rockchip-vendor)
-    DEPENDS:=@TARGET_rockchip_armv8
-    VARIANT:=rk3328
-endef
-
-define Package/arm-trusted-firmware-rk3399
-    $(Package/arm-trusted-firmware-rockchip-vendor)
-    DEPENDS:=@TARGET_rockchip_armv8
-    VARIANT:=rk3399
-endef
-
-define Package/arm-trusted-firmware-rk3528
-    $(Package/arm-trusted-firmware-rockchip-vendor)
-    DEPENDS:=@TARGET_rockchip_armv8
-    VARIANT:=rk3528
-endef
-
-define Package/arm-trusted-firmware-rk3566
-    $(Package/arm-trusted-firmware-rockchip-vendor)
-    DEPENDS:=@TARGET_rockchip_armv8
-    VARIANT:=rk3566
-endef
-
-define Package/arm-trusted-firmware-rk3568
-    $(Package/arm-trusted-firmware-rockchip-vendor)
-    DEPENDS:=@TARGET_rockchip_armv8
-    VARIANT:=rk3568
-endef
-
-define Build/Configure
-	$(SED) 's,$$$$(PKG_BUILD_DIR),$(PKG_BUILD_DIR),g' $(PKG_BUILD_DIR)/trust.ini
-	$(SED) 's,$$$$(VARIANT),$(BUILD_VARIANT),g' $(PKG_BUILD_DIR)/trust.ini
-	$(call Build/Configure/Default)
-endef
-
-define Build/Compile
-	$(CURDIR)/pack-firmware.sh build $(BUILD_VARIANT) '$(PKG_BUILD_DIR)'
-endef
-
-define Build/InstallDev
-	$(CURDIR)/pack-firmware.sh install $(BUILD_VARIANT) '$(PKG_BUILD_DIR)' '$(STAGING_DIR_IMAGE)'
-endef
-
-define Package/arm-trusted-firmware-rk3328/install
-endef
-
-define Package/arm-trusted-firmware-rk3399/install
-endef
-
-define Package/arm-trusted-firmware-rk3528/install
-endef
-
-define Package/arm-trusted-firmware-rk3566/install
-endef
-
-define Package/arm-trusted-firmware-rk3568/install
-endef
-
-$(eval $(call BuildPackage,arm-trusted-firmware-rk3328))
-$(eval $(call BuildPackage,arm-trusted-firmware-rk3399))
-$(eval $(call BuildPackage,arm-trusted-firmware-rk3528))
-$(eval $(call BuildPackage,arm-trusted-firmware-rk3566))
-$(eval $(call BuildPackage,arm-trusted-firmware-rk3568))
diff --git a/package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh b/package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh
deleted file mode 100755
index ed0c12401..000000000
--- a/package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2021 ImmortalWrt.org
-
-ACTION="$1"
-VARIANT="$2"
-PKG_BUILD_DIR="$3"
-STAGING_DIR_IMAGE="$4"
-
-case "$VARIANT" in
-"rk3328")
-	ATF="rk33/rk322xh_bl31_v1.49.elf"
-	DDR="rk33/rk3328_ddr_333MHz_v1.19.bin"
-	LOADER="rk33/rk322xh_miniloader_v2.50.bin"
-	;;
-"rk3399")
-	ATF="rk33/rk3399_bl31_v1.36.elf"
-	DDR="rk33/rk3399_ddr_800MHz_v1.30.bin"
-	LOADER="rk33/rk3399_miniloader_v1.30.bin"
-	;;
-"rk3528")
-	ATF="rk35/rk3528_bl31_v1.17.elf"
-	DDR="rk35/rk3528_ddr_1056MHz_v1.09.bin"
-	;;
-"rk3566")
-	ATF="rk35/rk3568_bl31_v1.44.elf"
-	DDR="rk35/rk3566_ddr_1056MHz_v1.21.bin"
-	;;
-"rk3568")
-	ATF="rk35/rk3568_bl31_v1.44.elf"
-	DDR="rk35/rk3568_ddr_1560MHz_v1.21.bin"
-	;;
-"rk3588")
-	ATF="rk35/rk3588_bl31_v1.45.elf"
-	DDR="rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin"
-	;;
-*)
-	echo -e "Not compatible with your platform: $VARIANT."
-	exit 1
-	;;
-esac
-
-set -x
-if [ "$ACTION" == "build" ]; then
-	case "$VARIANT" in
-	rk33*)
-		"$PKG_BUILD_DIR"/tools/mkimage -n "$VARIANT" -T "rksd" -d "$PKG_BUILD_DIR/bin/$DDR" "$PKG_BUILD_DIR/$VARIANT-idbloader.bin"
-		cat "$PKG_BUILD_DIR/bin/$LOADER" >> "$PKG_BUILD_DIR/$VARIANT-idbloader.bin"
-		"$PKG_BUILD_DIR/tools/trust_merger" --replace "bl31.elf" "$PKG_BUILD_DIR/bin/$ATF" "$PKG_BUILD_DIR/trust.ini"
-		;;
-	esac
-elif [ "$ACTION" == "install" ]; then
-	mkdir -p "$STAGING_DIR_IMAGE"
-	cp -fp "$PKG_BUILD_DIR/bin/$ATF" "$STAGING_DIR_IMAGE"/
-	case "$VARIANT" in
-	rk33*)
-		cp -fp "$PKG_BUILD_DIR/tools/loaderimage" "$STAGING_DIR_IMAGE"/
-		cp -fp "$PKG_BUILD_DIR/$VARIANT-idbloader.bin" "$STAGING_DIR_IMAGE"/
-		cp -fp "$PKG_BUILD_DIR/$VARIANT-trust.bin" "$STAGING_DIR_IMAGE"/
-		;;
-	rk35*)
-		cp -fp "$PKG_BUILD_DIR/bin/$DDR" "$STAGING_DIR_IMAGE"/
-		;;
-	esac
-else
-	echo -e "Unknown operation: $ACTION."
-	exit 1
-fi
-set +x
diff --git a/package/boot/rockchip-rkbin/Makefile b/package/boot/rockchip-rkbin/Makefile
new file mode 100644
index 000000000..8b94b1ad1
--- /dev/null
+++ b/package/boot/rockchip-rkbin/Makefile
@@ -0,0 +1,110 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Copyright (C) 2021-2023 ImmortalWrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=rkbin
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/rockchip-linux/rkbin.git
+PKG_SOURCE_DATE:=2024-02-22
+PKG_SOURCE_VERSION:=a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0
+PKG_MIRROR_HASH:=49ffeae00fd5b6f53c94ae43d5377325e9284bd6ec5be3ab388512cccae7babd
+
+PKG_LICENSE_FILES:=LICENSE
+PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/trusted-firmware-a.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Trusted-Firmware-A/Default
+  NAME:=Rockchip $(1) SoCs
+  BUILD_TARGET:=rockchip
+endef
+
+define Trusted-Firmware-A/rk3328
+  BUILD_SUBTARGET:=armv8
+  ATF:=rk33/rk322xh_bl31_v1.49.elf
+  TPL:=rk33/rk3328_ddr_333MHz_v1.19.bin
+  SPL:=rk33/rk322xh_miniloader_v2.50.bin
+endef
+
+define Trusted-Firmware-A/rk3399
+  BUILD_SUBTARGET:=armv8
+  ATF:=rk33/rk3399_bl31_v1.36.elf
+  TPL:=rk33/rk3399_ddr_800MHz_v1.30.bin
+  SPL:=rk33/rk3399_miniloader_v1.30.bin
+endef
+
+define Trusted-Firmware-A/rk3528
+  BUILD_SUBTARGET:=armv8
+  ATF:=rk35/rk3528_bl31_v1.17.elf
+  TPL:=rk35/rk3528_ddr_1056MHz_v1.09.bin
+endef
+
+define Trusted-Firmware-A/rk3566
+  BUILD_SUBTARGET:=armv8
+  ATF:=rk35/rk3568_bl31_v1.44.elf
+  TPL:=rk35/rk3566_ddr_1056MHz_v1.21.bin
+endef
+
+define Trusted-Firmware-A/rk3568
+  BUILD_SUBTARGET:=armv8
+  ATF:=rk35/rk3568_bl31_v1.44.elf
+  TPL:=rk35/rk3568_ddr_1560MHz_v1.21.bin
+endef
+
+define Trusted-Firmware-A/rk3588
+  BUILD_SUBTARGET:=armv8
+  ATF:=rk35/rk3588_bl31_v1.45.elf
+  TPL:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin
+endef
+
+TFA_TARGETS:= \
+	rk3328 \
+	rk3399 \
+	rk3528 \
+	rk3566 \
+	rk3568 \
+	rk3588
+
+define Build/Compile
+	# workaround for "extraneous 'endif'" error
+ifneq ($(SPL),)
+	( \
+		pushd $(PKG_BUILD_DIR) ; \
+		$(SED) 's,$$$$(PKG_BUILD_DIR),$(PKG_BUILD_DIR),g' trust.ini ; \
+		$(SED) 's,$$$$(VARIANT),$(BUILD_VARIANT),g' trust.ini ; \
+		./tools/mkimage -n $(BUILD_VARIANT) -T rksd -d bin/$(DDR) \
+			$(BUILD_VARIANT)-idbloader.bin ; \
+		cat bin/$(SPL) >> $(BUILD_VARIANT)-idbloader.bin ; \
+		./tools/trust_merger --replace bl31.elf bin/$(ATF) trust.ini ; \
+		popd ; \
+	)
+endif
+endef
+
+define Package/trusted-firmware-a/install
+	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
+
+	$(CP) $(PKG_BUILD_DIR)/bin/$(ATF) $(STAGING_DIR_IMAGE)/
+ifneq ($(SPL),)
+	$(CP) $(PKG_BUILD_DIR)/tools/loaderimage $(STAGING_DIR_IMAGE)/
+	$(CP) $(PKG_BUILD_DIR)/$(BUILD_VARIANT)-idbloader.bin $(STAGING_DIR_IMAGE)/
+	$(CP) $(PKG_BUILD_DIR)/$(BUILD_VARIANT)-trust.bin $(STAGING_DIR_IMAGE)/
+else
+	$(CP) $(PKG_BUILD_DIR)/bin/$(DDR) $(STAGING_DIR_IMAGE)/
+endif
+endef
+
+define Package/trusted-firmware-a/install
+	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
+
+	$(CP) $(PKG_BUILD_DIR)/bin/$(ATF) $(STAGING_DIR_IMAGE)/
+	$(CP) $(PKG_BUILD_DIR)/bin/$(TPL) $(STAGING_DIR_IMAGE)/
+endef
+
+$(eval $(call BuildPackage/Trusted-Firmware-A))
diff --git a/package/boot/arm-trusted-firmware-rockchip-vendor/src/trust.ini b/package/boot/rockchip-rkbin/src/trust.ini
similarity index 100%
rename from package/boot/arm-trusted-firmware-rockchip-vendor/src/trust.ini
rename to package/boot/rockchip-rkbin/src/trust.ini
diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
index 5df7a7031..4d73904ee 100644
--- a/package/boot/uboot-rockchip/Makefile
+++ b/package/boot/uboot-rockchip/Makefile
@@ -24,336 +24,274 @@ endef
 
 # RK3328 boards
 
-define U-Boot/nanopi-r2c-rk3328
+define U-Boot/rk3328/Default
   BUILD_SUBTARGET:=armv8
-  NAME:=NanoPi R2C
-  BUILD_DEVICES:= \
-    friendlyarm_nanopi-r2c
-  DEPENDS:=+PACKAGE_u-boot-nanopi-r2c-rk3328:arm-trusted-firmware-rk3328
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
+  DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3328
   ATF:=rk322xh_bl31_v1.49.elf
   USE_RKBIN:=1
 endef
 
+define U-Boot/nanopi-r2c-rk3328
+  $(U-Boot/rk3328/Default)
+  NAME:=NanoPi R2C
+  BUILD_DEVICES:= \
+    friendlyarm_nanopi-r2c
+endef
+
 define U-Boot/nanopi-r2s-rk3328
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3328/Default)
   NAME:=NanoPi R2S
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r2s \
     friendlyarm_nanopi-neo3
-  DEPENDS:=+PACKAGE_u-boot-nanopi-r2s-rk3328:arm-trusted-firmware-rk3328
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk322xh_bl31_v1.49.elf
-  USE_RKBIN:=1
 endef
 
 define U-Boot/orangepi-r1-plus-rk3328
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3328/Default)
   NAME:=Orange Pi R1 Plus
   BUILD_DEVICES:= \
     xunlong_orangepi-r1-plus
-  DEPENDS:=+PACKAGE_u-boot-orangepi-r1-plus-rk3328:arm-trusted-firmware-rk3328
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk322xh_bl31_v1.49.elf
-  USE_RKBIN:=1
 endef
 
 define U-Boot/orangepi-r1-plus-lts-rk3328
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3328/Default)
   NAME:=Orange Pi R1 Plus LTS
   BUILD_DEVICES:= \
     xunlong_orangepi-r1-plus-lts
-  DEPENDS:=+PACKAGE_u-boot-orangepi-r1-plus-lts-rk3328:arm-trusted-firmware-rk3328
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk322xh_bl31_v1.49.elf
-  USE_RKBIN:=1
 endef
 
 
 # RK3399 boards
 
-define U-Boot/guangmiao-g4c-rk3399
+define U-Boot/rk3399/Default
   BUILD_SUBTARGET:=armv8
-  NAME:=GuangMiao G4C
-  BUILD_DEVICES:= \
-    sharevdi_guangmiao-g4c
-  DEPENDS:=+PACKAGE_u-boot-guangmiao-g4c-rk3399:arm-trusted-firmware-rockchip
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
+  DEPENDS:=+PACKAGE_u-boot-$(1):arm-trusted-firmware-rockchip
   ATF:=rk3399_bl31.elf
 endef
 
+define U-Boot/dlfr100-rk3399
+  $(U-Boot/rk3399/Default)
+  NAME:=Dilusense DLFR100
+  BUILD_DEVICES:= \
+    dilusense_dlfr100
+endef
+
+define U-Boot/h3399pc-rk3399
+  $(U-Boot/rk3399/Default)
+  NAME:=SHAREVDI H3399PC
+  BUILD_DEVICES:= \
+    sharevdi_h3399pc
+endef
+
+define U-Boot/king3399-rk3399
+  $(U-Boot/rk3399/Default)
+  NAME:=Rongpin King3399
+  BUILD_DEVICES:= \
+    rongpin_king3399
+endef
+
+define U-Boot/mpc1903-rk3399
+  $(U-Boot/rk3399/Default)
+  NAME:=Rocktech MPC1903
+  BUILD_DEVICES:= \
+    rocktech_mpc1903
+endef
+
+define U-Boot/nanopc-t4-rk3399
+  $(U-Boot/rk3399/Default)
+  NAME:=NanoPC T4
+  BUILD_DEVICES:= \
+    friendlyarm_nanopc-t4
+endef
+
 define U-Boot/nanopi-r4s-rk3399
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3399/Default)
   NAME:=NanoPi R4S
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r4s
-  DEPENDS:=+PACKAGE_u-boot-nanopi-r4s-rk3399:arm-trusted-firmware-rk3399
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
+  DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3399
   ATF:=rk3399_bl31_v1.36.elf
   USE_RKBIN:=1
 endef
 
 define U-Boot/nanopi-r4se-rk3399
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3399/Default)
   NAME:=NanoPi R4SE
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r4se
-  DEPENDS:=+PACKAGE_u-boot-nanopi-r4se-rk3399:arm-trusted-firmware-rk3399
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
+  DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3399
   ATF:=rk3399_bl31_v1.36.elf
   USE_RKBIN:=1
 endef
 
 define U-Boot/rock-pi-4-rk3399
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3399/Default)
   NAME:=Rock Pi 4
   BUILD_DEVICES:= \
     radxa_rock-pi-4
-  DEPENDS:=+PACKAGE_u-boot-rock-pi-4-rk3399:arm-trusted-firmware-rockchip
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
-  ATF:=rk3399_bl31.elf
 endef
 
 define U-Boot/rockpro64-rk3399
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3399/Default)
   NAME:=RockPro64
   BUILD_DEVICES:= \
     pine64_rockpro64
-  DEPENDS:=+PACKAGE_u-boot-rockpro64-rk3399:arm-trusted-firmware-rockchip
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
-  ATF:=rk3399_bl31.elf
-endef
-
-define U-Boot/rongpin-king3399-rk3399
-  BUILD_SUBTARGET:=armv8
-  NAME:=Rongpin King3399
-  BUILD_DEVICES:= \
-    rongpin_king3399
-  DEPENDS:=+PACKAGE_u-boot-rongpin-king3399-rk3399:arm-trusted-firmware-rk3399
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3399_bl31_v1.36.elf
-  USE_RKBIN:=1
-endef
-
-define U-Boot/rocktech-mpc1903-rk3399
-  BUILD_SUBTARGET:=armv8
-  NAME:=Rocktech MPC1903
-  BUILD_DEVICES:= \
-    rocktech_mpc1903
-  DEPENDS:=+PACKAGE_u-boot-rocktech-mpc1903-rk3399:arm-trusted-firmware-rk3399
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3399_bl31_v1.36.elf
-  USE_RKBIN:=1
-endef
-
-define U-Boot/sharevdi-h3399pc-rk3399
-  BUILD_SUBTARGET:=armv8
-  NAME:=SHAREVDI H3399PC
-  BUILD_DEVICES:= \
-    sharevdi_h3399pc
-  DEPENDS:=+PACKAGE_u-boot-sharevdi-h3399pc-rk3399:arm-trusted-firmware-rk3399
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3399_bl31_v1.36.elf
-  USE_RKBIN:=1
-endef
-
-define U-Boot/dilusense-dlfr100-rk3399
-  BUILD_SUBTARGET:=armv8
-  NAME:=Dilusense DLFR100
-  BUILD_DEVICES:= \
-    dilusense_dlfr100
-  DEPENDS:=+PACKAGE_u-boot-dilusense-dlfr100-rk3399:arm-trusted-firmware-rk3399
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3399_bl31_v1.36.elf
-  USE_RKBIN:=1
 endef
 
 define U-Boot/xiaobao-nas-v1-rk3399
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3399/Default)
   NAME:=Codinge Xiaobao NAS-I
   BUILD_DEVICES:= \
     codinge_xiaobao-nas-v1
-  DEPENDS:=+PACKAGE_u-boot-xiaobao-nas-v1-rk3399:arm-trusted-firmware-rk3399
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3399_bl31_v1.36.elf
-  USE_RKBIN:=1
+endef
+
+define U-Boot/guangmiao-g4c-rk3399
+  $(U-Boot/rk3399/Default)
+  NAME:=GuangMiao G4C
+  BUILD_DEVICES:= \
+    sharevdi_guangmiao-g4c
 endef
 
 define U-Boot/sv901-eaio-rk3399
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3399/Default)
   NAME:=SV901 EAIO
   BUILD_DEVICES:= \
     scensmart_sv901-eaio
-  DEPENDS:=+PACKAGE_u-boot-sv901-eaio-rk3399:arm-trusted-firmware-rk3399
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
+  DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3399
   ATF:=rk3399_bl31_v1.36.elf
   USE_RKBIN:=1
 endef
 
 # RK3566 boards
 
-define U-Boot/panther-x2-rk3566
+define U-Boot/rk3566/Default
   BUILD_SUBTARGET:=armv8
+  DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3566
+  ATF:=rk3568_bl31_v1.44.elf
+  TPL:=rk3566_ddr_1056MHz_v1.21.bin
+endef
+
+define U-Boot/panther-x2-rk3566
+  $(U-Boot/rk3566/Default)
   NAME:=Panther X2
   BUILD_DEVICES:= \
     panther_x2
-  DEPENDS:=+PACKAGE_u-boot-panther-x2-rk3566:arm-trusted-firmware-rk3566
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3566_ddr_1056MHz_v1.21.bin
 endef
 
 # RK3568 boards
 
-define U-Boot/lyt-t68m-rk3568
+define U-Boot/rk3568/Default
   BUILD_SUBTARGET:=armv8
-  NAME:=LYT T68M
-  BUILD_DEVICES:= \
-    lyt_t68m
-  DEPENDS:=+PACKAGE_u-boot-lyt-t68m-rk3568:arm-trusted-firmware-rk3568
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
+  DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3568
   ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
+  TPL:=rk3568_ddr_1560MHz_v1.21.bin
+endef
+
+define U-Boot/lyt-t68m-rk3568
+  $(U-Boot/rk3568/Default)
+  NAME:=LYT T68M
+  BUILD_DEVICES:= lyt_t68m
 endef
 
 define U-Boot/mrkaio-m68s-rk3568
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3568/Default)
   NAME:=Mrkaio M68S
   BUILD_DEVICES:= \
     ezpro_mrkaio-m68s \
     ezpro_mrkaio-m68s-plus
-  DEPENDS:=+PACKAGE_u-boot-mrkaio-m68s-rk3568:arm-trusted-firmware-rk3568
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
 endef
 
 define U-Boot/nanopi-r5s-rk3568
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3568/Default)
   NAME:=NanoPi R5S
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r5c \
     friendlyarm_nanopi-r5s
-  DEPENDS:=+PACKAGE_u-boot-nanopi-r5s-rk3568:arm-trusted-firmware-rk3568
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
 endef
 
 define U-Boot/opc-h68k-rk3568
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3568/Default)
   NAME:=OPC-H68K Board
   BUILD_DEVICES:= \
     hinlink_opc-h66k \
     hinlink_opc-h68k \
     hinlink_opc-h69k
-  DEPENDS:=+PACKAGE_u-boot-opc-h68k-rk3568:arm-trusted-firmware-rk3568
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
 endef
 
 define U-Boot/photonicat-rk3568
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3568/Default)
   NAME:=Ariaboard Photonicat
   BUILD_DEVICES:= \
     ariaboard_photonicat
-  DEPENDS:=+PACKAGE_u-boot-photonicat-rk3568:arm-trusted-firmware-rk3568
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
-endef
-
-define U-Boot/radxa-e25-rk3568
-  BUILD_SUBTARGET:=armv8
-  NAME:=Radxa E25
-  BUILD_DEVICES:= \
-    radxa_e25
-  DEPENDS:=+PACKAGE_u-boot-radxa-e25-rk3568:arm-trusted-firmware-rk3568
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
-endef
-
-define U-Boot/rock-3a-rk3568
-  BUILD_SUBTARGET:=armv8
-  NAME:=ROCK3 Model A
-  BUILD_DEVICES:= \
-    radxa_rock-3a
-  DEPENDS:=+PACKAGE_u-boot-rock-3a-rk3568:arm-trusted-firmware-rk3568
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
 endef
 
 define U-Boot/r66s-rk3568
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3568/Default)
   NAME:=R66S/R68S
   BUILD_DEVICES:= \
     fastrhino_r66s \
     fastrhino_r68s
-  DEPENDS:=+PACKAGE_u-boot-r66s-rk3568:arm-trusted-firmware-rk3568
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
+endef
+
+define U-Boot/radxa-e25-rk3568
+  $(U-Boot/rk3568/Default)
+  NAME:=Radxa E25
+  BUILD_DEVICES:= \
+    radxa_e25
+endef
+
+define U-Boot/rock-3a-rk3568
+  $(U-Boot/rk3568/Default)
+  NAME:=ROCK 3A
+  BUILD_DEVICES:= \
+    radxa_rock-3a
+endef
+
+define U-Boot/rsb4810-rk3568
+  $(U-Boot/rk3568/Default)
+  NAME:=Advantech RSB4810
+  BUILD_DEVICES:= \
+    advantech_rsb4810
 endef
 
 define U-Boot/seewo-sv21-rk3568
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3568/Default)
   NAME:=Seewo sv21-rk3568
   BUILD_DEVICES:= \
     seewo_sv21-rk3568
-  DEPENDS:=+PACKAGE_u-boot-seewo-sv21-rk3568:arm-trusted-firmware-rk3568
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
 endef
 
 define U-Boot/station-p2-rk3568
-  BUILD_SUBTARGET:=armv8
+  $(U-Boot/rk3568/Default)
   NAME:=StationP2
   BUILD_DEVICES:= \
-       firefly_station-p2
-  DEPENDS:=+PACKAGE_u-boot-station-p2-rk3568:arm-trusted-firmware-rk3568
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
-endef
-
-define U-Boot/advantech-rsb4810-rk3568
-  BUILD_SUBTARGET:=armv8
-  NAME:=Advantech RSB4810
-  BUILD_DEVICES:= \
-       advantech_rsb4810
-  DEPENDS:=+PACKAGE_u-boot-advantech-rsb4810-rk3568:arm-trusted-firmware-rk3568
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
-  ATF:=rk3568_bl31_v1.44.elf
-  DDR:=rk3568_ddr_1560MHz_v1.21.bin
+    firefly_station-p2
 endef
 
 UBOOT_TARGETS := \
-  advantech-rsb4810-rk3568 \
+  panther-x2-rk3566 \
   lyt-t68m-rk3568 \
   mrkaio-m68s-rk3568 \
+  nanopi-r5s-rk3568 \
   opc-h68k-rk3568 \
   photonicat-rk3568 \
+  r66s-rk3568 \
   radxa-e25-rk3568 \
   rock-3a-rk3568 \
-  r66s-rk3568 \
+  rsb4810-rk3568 \
   seewo-sv21-rk3568 \
   station-p2-rk3568 \
-  panther-x2-rk3566 \
-  sv901-eaio-rk3399 \
-  guangmiao-g4c-rk3399 \
+  dlfr100-rk3399 \
+  h3399pc-rk3399 \
+  king3399-rk3399 \
+  mpc1903-rk3399 \
+  nanopc-t4-rk3399 \
   nanopi-r4s-rk3399 \
   nanopi-r4se-rk3399 \
-  nanopi-r5s-rk3568 \
   rock-pi-4-rk3399 \
   rockpro64-rk3399 \
-  rongpin-king3399-rk3399 \
-  rocktech-mpc1903-rk3399 \
-  sharevdi-h3399pc-rk3399 \
-  dilusense-dlfr100-rk3399 \
+  sv901-eaio-rk3399 \
+  guangmiao-g4c-rk3399 \
   xiaobao-nas-v1-rk3399 \
   nanopi-r2c-rk3328 \
   nanopi-r2s-rk3328 \
@@ -363,18 +301,9 @@ UBOOT_TARGETS := \
 UBOOT_CONFIGURE_VARS += USE_PRIVATE_LIBGCC=yes
 
 UBOOT_MAKE_FLAGS += \
+  BL31=$(STAGING_DIR_IMAGE)/$(ATF) \
   PATH=$(STAGING_DIR_HOST)/bin:$(PATH) \
-  BL31=$(STAGING_DIR_IMAGE)/$(ATF)
-
-ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3568),y)
-UBOOT_MAKE_FLAGS += \
-  ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(DDR)
-endif
-
-ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3566),y)
-UBOOT_MAKE_FLAGS += \
-  ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(DDR)
-endif
+  $(if $(TPL),ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(TPL))
 
 define Build/Configure
 	$(call Build/Configure/U-Boot)