rkbin: rename tpl-only target

No need to copy ATF blob again.

Signed-off-by: Tianling Shen <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/19998
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/package/boot/rkbin/Makefile b/package/boot/rkbin/Makefile
index cc9073fcec36ab961d856494349d512f414ea425..668b8a9e94a4a10e766dcb0325c9231eebd13f41 100644 (file)
--- a/package/boot/rkbin/Makefile
+++ b/package/boot/rkbin/Makefile
@@ -31,10 +31,9 @@ define Trusted-Firmware-A/rk3308
   TPL:=rk33/rk3308_ddr_589MHz_uart2_m1_v2.10.bin
 endef
 
-define Trusted-Firmware-A/rk3308-rock-pi-s
-  NAME:=Radxa ROCK Pi S
+define Trusted-Firmware-A/rk3308-tpl-rock-pi-s
+  NAME:=Radxa ROCK Pi S board
   BUILD_SUBTARGET:=armv8
-  ATF:=rk33/rk3308_bl31_v2.27.elf
   TPL:=rk33/rk3308_ddr_589MHz_uart0_m0_v2.10.bin
 endef
 
@@ -50,27 +49,27 @@ define Trusted-Firmware-A/rk3568
   TPL:=rk35/rk3568_ddr_1560MHz_v1.23.bin
 endef
 
-define Trusted-Firmware-A/rk3568-e25
+define Trusted-Firmware-A/rk3568-tpl-e25
   NAME:=Radxa E25 board
   BUILD_SUBTARGET:=armv8
-  ATF:=rk35/rk3568_bl31_v1.45.elf
   TPL:=rk35/rk3568_ddr_1560MHz_uart2_m0_115200_v1.23.bin
 endef
 
 define Trusted-Firmware-A/rk3588-tpl
+  NAME:=Rockchip RK3588 SoCs
   BUILD_SUBTARGET:=armv8
   TPL:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.19.bin
 endef
 
 TFA_TARGETS:= \
        rk3308 \
-       rk3308-rock-pi-s \
+       rk3308-tpl-rock-pi-s \
        rk3566 \
        rk3568 \
-       rk3568-e25 \
+       rk3568-tpl-e25 \
        rk3588-tpl
 
-ifeq ($(BUILD_VARIANT),rk3308-rock-pi-s)
+ifeq ($(BUILD_VARIANT),rk3308-tpl-rock-pi-s)
   define Download/rk3308-tpl-rock-pi-s
     FILE:=$(notdir $(TPL))
     URL_FILE:=$(TPL)
@@ -86,7 +85,7 @@ ifeq ($(BUILD_VARIANT),rk3308-rock-pi-s)
   endef
 endif
 
-ifeq ($(BUILD_VARIANT),rk3568-e25)
+ifeq ($(BUILD_VARIANT),rk3568-tpl-e25)
   define Download/rk3568-tpl-e25
     FILE:=$(notdir $(TPL))
     URL_FILE:=$(TPL)

diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
index f4ac18e1a22b094a46a417ceddd41136f813e03e..254e76cf8e37a1e8727a40ac5bfca41892a8f03a 100644 (file)
--- a/package/boot/uboot-rockchip/Makefile
+++ b/package/boot/uboot-rockchip/Makefile
@@ -35,7 +35,7 @@ endef
 
 define U-Boot/rock-pi-s-rk3308
   $(U-Boot/rk3308/Default)
-  DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3308-rock-pi-s
+  DEPENDS+=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3308-tpl-rock-pi-s
   TPL:=rk3308_ddr_589MHz_uart0_m0_v2.10.bin
   NAME:=ROCK Pi S
   BUILD_DEVICES:= \
@@ -235,7 +235,7 @@ endef
 
 define U-Boot/radxa-e25-rk3568
   $(U-Boot/rk3568/Default)
-  DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3568-e25
+  DEPENDS+=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3568-tpl-e25
   TPL:=rk3568_ddr_1560MHz_uart2_m0_115200_v1.23.bin
   NAME:=E25
   BUILD_DEVICES:= \