From 3b681972500466d5ea56c1e5cea428954687c6f2 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Fri, 5 Apr 2024 18:22:48 +0800
Subject: [PATCH] arm-trusted-firmware-rockchip-vendor: add RK3528/RK3588
 support

---
 .../Makefile                                  | 119 ++++++++++--------
 .../atf-version.mk                            |  17 +++
 .../pack-firmware.sh                          |  64 ----------
 package/boot/uboot-rockchip/Makefile          |  50 ++++----
 4 files changed, 109 insertions(+), 141 deletions(-)
 create mode 100644 package/boot/arm-trusted-firmware-rockchip-vendor/atf-version.mk
 delete mode 100755 package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh

diff --git a/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile b/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile
index 1374f16a2..1668a8c3a 100644
--- a/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile
+++ b/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile
@@ -1,81 +1,96 @@
 # SPDX-License-Identifier: GPL-2.0-only
 #
-# Copyright (C) 2022 ImmortalWrt.org
+# Copyright (C) 2021-2023 ImmortalWrt.org
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/trusted-firmware-a.mk
 
-PKG_NAME:=arm-trusted-firmware-rockchip-vendor
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_NAME:=rkbin
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=https://github.com/rockchip-linux/rkbin.git
-PKG_SOURCE_DATE:=2023-07-26
-PKG_SOURCE_VERSION:=b4558da0860ca48bf1a571dd33ccba580b9abe23
-PKG_MIRROR_HASH:=039f0f72d0dd179487b5d4b135d13684b220f3d81fa7308a34431a86701f69c6
+PKG_SOURCE_URL:=https://gitlab.com/rk3588_linux/rk/rkbin.git
+PKG_SOURCE_DATE:=2023-08-04
+PKG_SOURCE_VERSION:=1a417bbf7d05c3491ee9613be12a9905fbb8ccb7
+PKG_MIRROR_HASH:=5ca2f3b759759ed7c5be70e7ec5e1f0c8d82b6db8265e83f637a55b2b3d61fe5
 
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 
-MAKE_PATH:=$(PKG_NAME)
-
 include $(INCLUDE_DIR)/package.mk
+include ./atf-version.mk
 
-define Package/arm-trusted-firmware-rockchip-vendor
-    SECTION:=boot
-    CATEGORY:=Boot Loaders
-    TITLE:=ARM Trusted Firmware for Rockchip
+define Trusted-Firmware-A/Default
+  NAME:=Rockchip $(1)
+  BUILD_TARGET:=rockchip
 endef
 
-define Package/arm-trusted-firmware-rk3328
-    $(Package/arm-trusted-firmware-rockchip-vendor)
-    DEPENDS:=@TARGET_rockchip_armv8
-    VARIANT:=rk3328
+define Trusted-Firmware-A/rk3328
+  ATF:=rk33/$(RK3328_ATF)
+  DDR:=rk33/$(RK3328_DDR)
+  LOADER:=rk33/$(RK3328_LOADER)
 endef
 
-define Package/arm-trusted-firmware-rk3399
-    $(Package/arm-trusted-firmware-rockchip-vendor)
-    DEPENDS:=@TARGET_rockchip_armv8
-    VARIANT:=rk3399
+define Trusted-Firmware-A/rk3399
+  ATF:=rk33/$(RK3399_ATF)
+  DDR:=rk33/$(RK3399_DDR)
+  LOADER:=rk33/$(RK3399_LOADER)
 endef
 
-define Package/arm-trusted-firmware-rk3566
-    $(Package/arm-trusted-firmware-rockchip-vendor)
-    DEPENDS:=@TARGET_rockchip_armv8
-    VARIANT:=rk3566
+define Trusted-Firmware-A/rk3528
+  ATF:=rk35/$(RK3528_ATF)
+  DDR:=rk35/$(RK3528_DDR)
 endef
 
-define Package/arm-trusted-firmware-rk3568
-    $(Package/arm-trusted-firmware-rockchip-vendor)
-    DEPENDS:=@TARGET_rockchip_armv8
-    VARIANT:=rk3568
+define Trusted-Firmware-A/rk3566
+  ATF:=rk35/$(RK3568_ATF)
+  DDR:=rk35/$(RK3566_DDR)
 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)
+define Trusted-Firmware-A/rk3568
+  ATF:=rk35/$(RK3568_ATF)
+  DDR:=rk35/$(RK3568_DDR)
 endef
 
+define Trusted-Firmware-A/rk3588
+  ATF:=rk35/$(RK3588_ATF)
+  DDR:=rk35/$(RK3588_DDR)
+endef
+
+TFA_TARGETS:= \
+  rk3328 \
+	rk3399 \
+	rk3528 \
+	rk3566 \
+	rk3568 \
+	rk3588
+
 define Build/Compile
-	$(CURDIR)/pack-firmware.sh build $(BUILD_VARIANT) '$(PKG_BUILD_DIR)'
+	# This comment is the workaround for "extraneous 'endif'" error
+ifneq ($(LOADER),)
+	( \
+		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/$(LOADER) >> $(BUILD_VARIANT)-idbloader.bin ; \
+		./tools/trust_merger --replace bl31.elf bin/$(ATF) trust.ini ; \
+		popd ; \
+	)
+endif
 endef
 
-define Build/InstallDev
-	$(CURDIR)/pack-firmware.sh install $(BUILD_VARIANT) '$(PKG_BUILD_DIR)' '$(STAGING_DIR_IMAGE)'
+define Package/trusted-firmware-a/install
+	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
+
+	$(CP) $(PKG_BUILD_DIR)/bin/$(ATF) $(STAGING_DIR_IMAGE)/
+ifneq ($(LOADER),)
+	$(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/arm-trusted-firmware-rk3328/install
-endef
-
-define Package/arm-trusted-firmware-rk3399/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-rk3566))
-$(eval $(call BuildPackage,arm-trusted-firmware-rk3568))
+$(eval $(call BuildPackage/Trusted-Firmware-A))
\ No newline at end of file
diff --git a/package/boot/arm-trusted-firmware-rockchip-vendor/atf-version.mk b/package/boot/arm-trusted-firmware-rockchip-vendor/atf-version.mk
new file mode 100644
index 000000000..03fc5acd9
--- /dev/null
+++ b/package/boot/arm-trusted-firmware-rockchip-vendor/atf-version.mk
@@ -0,0 +1,17 @@
+RK3328_ATF:=rk322xh_bl31_v1.49.elf
+RK3328_DDR:=rk3328_ddr_333MHz_v1.19.bin
+RK3328_LOADER:=rk322xh_miniloader_v2.50.bin
+
+RK3399_ATF:=rk3399_bl31_v1.36.elf
+RK3399_DDR:=rk3399_ddr_800MHz_v1.30.bin
+RK3399_LOADER:=rk3399_miniloader_v1.30.bin
+
+RK3528_ATF:=rk3528_bl31_v1.16.elf
+RK3528_DDR:=rk3528_ddr_1056MHz_v1.07.bin
+
+RK3568_ATF:=rk3568_bl31_v1.43.elf
+RK3568_DDR:=rk3568_ddr_1560MHz_v1.18.bin
+RK3566_DDR:=rk3566_ddr_1056MHz_v1.18.bin
+
+RK3588_ATF:=rk3588_bl31_v1.41.elf
+RK3588_DDR:=rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.13.bin
\ No newline at end of file
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 c5d1287a4..000000000
--- a/package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh
+++ /dev/null
@@ -1,64 +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"
-	;;
-"rk3566")
-	ATF="rk35/rk3568_bl31_v1.43.elf"
-	DDR="rk35/rk3566_ddr_1056MHz_v1.18.bin"
-	;;
-"rk3568")
-	ATF="rk35/rk3568_bl31_v1.43.elf"
-	DDR="rk35/rk3568_ddr_1560MHz_v1.18.bin"
-	;;
-"rk3588")
-	ATF="rk35/rk3588_bl31_v1.40.elf"
-	DDR="rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.12.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/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
index 54cc71af5..03ec32243 100644
--- a/package/boot/uboot-rockchip/Makefile
+++ b/package/boot/uboot-rockchip/Makefile
@@ -29,7 +29,7 @@ define U-Boot/nanopi-r2c-rk3328
   NAME:=NanoPi R2C
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r2c
-  DEPENDS:=+PACKAGE_u-boot-nanopi-r2c-rk3328:arm-trusted-firmware-rk3328
+  DEPENDS:=+PACKAGE_u-boot-nanopi-r2c-rk3328:trusted-firmware-a-rk3328
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk322xh_bl31_v1.49.elf
   USE_RKBIN:=1
@@ -41,7 +41,7 @@ define U-Boot/nanopi-r2s-rk3328
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r2s \
     friendlyarm_nanopi-neo3
-  DEPENDS:=+PACKAGE_u-boot-nanopi-r2s-rk3328:arm-trusted-firmware-rk3328
+  DEPENDS:=+PACKAGE_u-boot-nanopi-r2s-rk3328:trusted-firmware-a-rk3328
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk322xh_bl31_v1.49.elf
   USE_RKBIN:=1
@@ -52,7 +52,7 @@ define U-Boot/orangepi-r1-plus-rk3328
   NAME:=Orange Pi R1 Plus
   BUILD_DEVICES:= \
     xunlong_orangepi-r1-plus
-  DEPENDS:=+PACKAGE_u-boot-orangepi-r1-plus-rk3328:arm-trusted-firmware-rk3328
+  DEPENDS:=+PACKAGE_u-boot-orangepi-r1-plus-rk3328:trusted-firmware-a-rk3328
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk322xh_bl31_v1.49.elf
   USE_RKBIN:=1
@@ -63,7 +63,7 @@ define U-Boot/orangepi-r1-plus-lts-rk3328
   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
+  DEPENDS:=+PACKAGE_u-boot-orangepi-r1-plus-lts-rk3328:trusted-firmware-a-rk3328
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk322xh_bl31_v1.49.elf
   USE_RKBIN:=1
@@ -87,7 +87,7 @@ define U-Boot/nanopi-r4s-rk3399
   NAME:=NanoPi R4S
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r4s
-  DEPENDS:=+PACKAGE_u-boot-nanopi-r4s-rk3399:arm-trusted-firmware-rk3399
+  DEPENDS:=+PACKAGE_u-boot-nanopi-r4s-rk3399:trusted-firmware-a-rk3399
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3399_bl31_v1.36.elf
   USE_RKBIN:=1
@@ -98,7 +98,7 @@ define U-Boot/nanopi-r4se-rk3399
   NAME:=NanoPi R4SE
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r4se
-  DEPENDS:=+PACKAGE_u-boot-nanopi-r4se-rk3399:arm-trusted-firmware-rk3399
+  DEPENDS:=+PACKAGE_u-boot-nanopi-r4se-rk3399:trusted-firmware-a-rk3399
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3399_bl31_v1.36.elf
   USE_RKBIN:=1
@@ -129,7 +129,7 @@ define U-Boot/rongpin-king3399-rk3399
   NAME:=Rongpin King3399
   BUILD_DEVICES:= \
     rongpin_king3399
-  DEPENDS:=+PACKAGE_u-boot-rongpin-king3399-rk3399:arm-trusted-firmware-rk3399
+  DEPENDS:=+PACKAGE_u-boot-rongpin-king3399-rk3399:trusted-firmware-a-rk3399
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3399_bl31_v1.36.elf
   USE_RKBIN:=1
@@ -140,7 +140,7 @@ define U-Boot/rocktech-mpc1903-rk3399
   NAME:=Rocktech MPC1903
   BUILD_DEVICES:= \
     rocktech_mpc1903
-  DEPENDS:=+PACKAGE_u-boot-rocktech-mpc1903-rk3399:arm-trusted-firmware-rk3399
+  DEPENDS:=+PACKAGE_u-boot-rocktech-mpc1903-rk3399:trusted-firmware-a-rk3399
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3399_bl31_v1.36.elf
   USE_RKBIN:=1
@@ -151,7 +151,7 @@ define U-Boot/sharevdi-h3399pc-rk3399
   NAME:=SHAREVDI H3399PC
   BUILD_DEVICES:= \
     sharevdi_h3399pc
-  DEPENDS:=+PACKAGE_u-boot-sharevdi-h3399pc-rk3399:arm-trusted-firmware-rk3399
+  DEPENDS:=+PACKAGE_u-boot-sharevdi-h3399pc-rk3399:trusted-firmware-a-rk3399
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3399_bl31_v1.36.elf
   USE_RKBIN:=1
@@ -162,7 +162,7 @@ define U-Boot/dilusense-dlfr100-rk3399
   NAME:=Dilusense DLFR100
   BUILD_DEVICES:= \
     dilusense_dlfr100
-  DEPENDS:=+PACKAGE_u-boot-dilusense-dlfr100-rk3399:arm-trusted-firmware-rk3399
+  DEPENDS:=+PACKAGE_u-boot-dilusense-dlfr100-rk3399:trusted-firmware-a-rk3399
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3399_bl31_v1.36.elf
   USE_RKBIN:=1
@@ -173,7 +173,7 @@ define U-Boot/xiaobao-nas-v1-rk3399
   NAME:=Codinge Xiaobao NAS-I
   BUILD_DEVICES:= \
     codinge_xiaobao-nas-v1
-  DEPENDS:=+PACKAGE_u-boot-xiaobao-nas-v1-rk3399:arm-trusted-firmware-rk3399
+  DEPENDS:=+PACKAGE_u-boot-xiaobao-nas-v1-rk3399:trusted-firmware-a-rk3399
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3399_bl31_v1.36.elf
   USE_RKBIN:=1
@@ -186,7 +186,7 @@ define U-Boot/panther-x2-rk3566
   NAME:=Panther X2
   BUILD_DEVICES:= \
     panther_x2
-  DEPENDS:=+PACKAGE_u-boot-panther-x2-rk3566:arm-trusted-firmware-rk3566
+  DEPENDS:=+PACKAGE_u-boot-panther-x2-rk3566:trusted-firmware-a-rk3566
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.43.elf
   DDR:=rk3566_ddr_1056MHz_v1.18.bin
@@ -199,7 +199,7 @@ define U-Boot/lyt-t68m-rk3568
   NAME:=LYT T68M
   BUILD_DEVICES:= \
     lyt_t68m
-  DEPENDS:=+PACKAGE_u-boot-lyt-t68m-rk3568:arm-trusted-firmware-rk3568
+  DEPENDS:=+PACKAGE_u-boot-lyt-t68m-rk3568:trusted-firmware-a-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.43.elf
   DDR:=rk3568_ddr_1560MHz_v1.18.bin
@@ -211,7 +211,7 @@ define U-Boot/mrkaio-m68s-rk3568
   BUILD_DEVICES:= \
     ezpro_mrkaio-m68s \
     ezpro_mrkaio-m68s-plus
-  DEPENDS:=+PACKAGE_u-boot-mrkaio-m68s-rk3568:arm-trusted-firmware-rk3568
+  DEPENDS:=+PACKAGE_u-boot-mrkaio-m68s-rk3568:trusted-firmware-a-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.43.elf
   DDR:=rk3568_ddr_1560MHz_v1.18.bin
@@ -223,7 +223,7 @@ define U-Boot/nanopi-r5s-rk3568
   BUILD_DEVICES:= \
     friendlyarm_nanopi-r5c \
     friendlyarm_nanopi-r5s
-  DEPENDS:=+PACKAGE_u-boot-nanopi-r5s-rk3568:arm-trusted-firmware-rk3568
+  DEPENDS:=+PACKAGE_u-boot-nanopi-r5s-rk3568:trusted-firmware-a-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.43.elf
   DDR:=rk3568_ddr_1560MHz_v1.18.bin
@@ -236,7 +236,7 @@ define U-Boot/opc-h68k-rk3568
     hinlink_opc-h66k \
     hinlink_opc-h68k \
     hinlink_opc-h69k
-  DEPENDS:=+PACKAGE_u-boot-opc-h68k-rk3568:arm-trusted-firmware-rk3568
+  DEPENDS:=+PACKAGE_u-boot-opc-h68k-rk3568:trusted-firmware-a-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.43.elf
   DDR:=rk3568_ddr_1560MHz_v1.18.bin
@@ -247,7 +247,7 @@ define U-Boot/photonicat-rk3568
   NAME:=Ariaboard Photonicat
   BUILD_DEVICES:= \
     ariaboard_photonicat
-  DEPENDS:=+PACKAGE_u-boot-photonicat-rk3568:arm-trusted-firmware-rk3568
+  DEPENDS:=+PACKAGE_u-boot-photonicat-rk3568:trusted-firmware-a-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.43.elf
   DDR:=rk3568_ddr_1560MHz_v1.18.bin
@@ -258,7 +258,7 @@ define U-Boot/radxa-e25-rk3568
   NAME:=Radxa E25
   BUILD_DEVICES:= \
     radxa_e25
-  DEPENDS:=+PACKAGE_u-boot-radxa-e25-rk3568:arm-trusted-firmware-rk3568
+  DEPENDS:=+PACKAGE_u-boot-radxa-e25-rk3568:trusted-firmware-a-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.43.elf
   DDR:=rk3568_ddr_1560MHz_v1.18.bin
@@ -269,7 +269,7 @@ define U-Boot/rock-3a-rk3568
   NAME:=ROCK3 Model A
   BUILD_DEVICES:= \
     radxa_rock-3a
-  DEPENDS:=+PACKAGE_u-boot-rock-3a-rk3568:arm-trusted-firmware-rk3568
+  DEPENDS:=+PACKAGE_u-boot-rock-3a-rk3568:trusted-firmware-a-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.43.elf
   DDR:=rk3568_ddr_1560MHz_v1.18.bin
@@ -281,7 +281,7 @@ define U-Boot/r66s-rk3568
   BUILD_DEVICES:= \
     fastrhino_r66s \
     fastrhino_r68s
-  DEPENDS:=+PACKAGE_u-boot-r66s-rk3568:arm-trusted-firmware-rk3568
+  DEPENDS:=+PACKAGE_u-boot-r66s-rk3568:trusted-firmware-a-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.43.elf
   DDR:=rk3568_ddr_1560MHz_v1.18.bin
@@ -292,7 +292,7 @@ define U-Boot/seewo-sv21-rk3568
   NAME:=Seewo sv21-rk3568
   BUILD_DEVICES:= \
     seewo_sv21-rk3568
-  DEPENDS:=+PACKAGE_u-boot-seewo-sv21-rk3568:arm-trusted-firmware-rk3568
+  DEPENDS:=+PACKAGE_u-boot-seewo-sv21-rk3568:trusted-firmware-a-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.43.elf
   DDR:=rk3568_ddr_1560MHz_v1.18.bin
@@ -303,7 +303,7 @@ define U-Boot/station-p2-rk3568
   NAME:=StationP2
   BUILD_DEVICES:= \
        firefly_station-p2
-  DEPENDS:=+PACKAGE_u-boot-station-p2-rk3568:arm-trusted-firmware-rk3568
+  DEPENDS:=+PACKAGE_u-boot-station-p2-rk3568:trusted-firmware-a-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.43.elf
   DDR:=rk3568_ddr_1560MHz_v1.18.bin
@@ -314,7 +314,7 @@ define U-Boot/advantech-rsb4810-rk3568
   NAME:=Advantech RSB4810
   BUILD_DEVICES:= \
        advantech_rsb4810
-  DEPENDS:=+PACKAGE_u-boot-advantech-rsb4810-rk3568:arm-trusted-firmware-rk3568
+  DEPENDS:=+PACKAGE_u-boot-advantech-rsb4810-rk3568:trusted-firmware-a-rk3568
   PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
   ATF:=rk3568_bl31_v1.43.elf
   DDR:=rk3568_ddr_1560MHz_v1.18.bin
@@ -354,12 +354,12 @@ UBOOT_MAKE_FLAGS += \
   PATH=$(STAGING_DIR_HOST)/bin:$(PATH) \
   BL31=$(STAGING_DIR_IMAGE)/$(ATF)
 
-ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3568),y)
+ifeq ($(CONFIG_PACKAGE_trusted-firmware-a-rk3568),y)
 UBOOT_MAKE_FLAGS += \
   ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(DDR)
 endif
 
-ifeq ($(CONFIG_PACKAGE_arm-trusted-firmware-rk3566),y)
+ifeq ($(CONFIG_PACKAGE_trusted-firmware-a-rk3566),y)
 UBOOT_MAKE_FLAGS += \
   ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(DDR)
 endif