From cb33d17dbaf0d9ee191653e825b79d2286c086ad Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Mon, 11 Nov 2024 23:26:06 +0800 Subject: [PATCH] Revert "rkbin: update to latest git HEAD" --- package/boot/rockchip-rkbin/Makefile | 25 +++++++++---------------- package/boot/uboot-rk35xx/Makefile | 2 +- package/boot/uboot-rockchip/Makefile | 8 ++++---- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/package/boot/rockchip-rkbin/Makefile b/package/boot/rockchip-rkbin/Makefile index 42fa8f3a3..41474b629 100644 --- 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-02-22 +PKG_SOURCE_VERSION:=a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0 +PKG_MIRROR_HASH:=49ffeae00fd5b6f53c94ae43d5377325e9284bd6ec5be3ab388512cccae7babd PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Tianling Shen @@ -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 @@ -52,31 +52,25 @@ endef define rkbin/rk3528 DEPENDS:=@TARGET_rockchip_armv8 ATF:=rk35/rk3528_bl31_v1.17.elf - TPL:=rk35/rk3528_ddr_1056MHz_v1.10.bin + TPL:=rk35/rk3528_ddr_1056MHz_v1.09.bin endef define rkbin/rk3566 DEPENDS:=@TARGET_rockchip_armv8 ATF:=rk35/rk3568_bl31_v1.44.elf - TPL:=rk35/rk3566_ddr_1056MHz_v1.23.bin + TPL:=rk35/rk3566_ddr_1056MHz_v1.21.bin endef define rkbin/rk3568 DEPENDS:=@TARGET_rockchip_armv8 ATF:=rk35/rk3568_bl31_v1.44.elf - TPL:=rk35/rk3568_ddr_1560MHz_v1.23.bin -endef - -define rkbin/rk3576 - DEPENDS:=@TARGET_rockchip_armv8 - ATF:=rk35/rk3576_bl31_v1.12.elf - TPL:=rk35/rk3576_ddr_lp4_2112MHz_lp5_2736MHz_v1.08.bin + TPL:=rk35/rk3568_ddr_1560MHz_v1.21.bin endef define rkbin/rk3588 DEPENDS:=@TARGET_rockchip_armv8 - ATF:=rk35/rk3588_bl31_v1.47.elf - TPL:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin + ATF:=rk35/rk3588_bl31_v1.45.elf + TPL:=rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin endef VARIANTS:= \ @@ -85,7 +79,6 @@ VARIANTS:= \ rk3528 \ rk3566 \ rk3568 \ - rk3576 \ rk3588 define Build/Compile diff --git a/package/boot/uboot-rk35xx/Makefile b/package/boot/uboot-rk35xx/Makefile index aa9ca321f..692ec965c 100644 --- a/package/boot/uboot-rk35xx/Makefile +++ b/package/boot/uboot-rk35xx/Makefile @@ -38,7 +38,7 @@ define U-Boot/evb-rk3528 widora_mangopi-m28k-pro DEPENDS:=+PACKAGE_u-boot-evb-rk3528:rkbin-rk3528 ATF:=rk3528_bl31_v1.17.elf - DDR:=rk3528_ddr_1056MHz_v1.10.bin + DDR:=rk3528_ddr_1056MHz_v1.09.bin UBOOT_CONFIG:=rk3528 SOC:=rk3528 endef diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile index 633ff1770..a3c9439c3 100644 --- a/package/boot/uboot-rockchip/Makefile +++ b/package/boot/uboot-rockchip/Makefile @@ -175,7 +175,7 @@ define U-Boot/rk3566/Default BUILD_SUBTARGET:=armv8 DEPENDS:=+PACKAGE_u-boot-$(1):rkbin-rk3566 ATF:=rk3568_bl31_v1.44.elf - TPL:=rk3566_ddr_1056MHz_v1.23.bin + TPL:=rk3566_ddr_1056MHz_v1.21.bin endef define U-Boot/nanopi-r3s-rk3566 @@ -205,7 +205,7 @@ define U-Boot/rk3568/Default BUILD_SUBTARGET:=armv8 DEPENDS:=+PACKAGE_u-boot-$(1):rkbin-rk3568 ATF:=rk3568_bl31_v1.44.elf - TPL:=rk3568_ddr_1560MHz_v1.23.bin + TPL:=rk3568_ddr_1560MHz_v1.21.bin endef define U-Boot/bpi-r2-pro-rk3568 @@ -298,8 +298,8 @@ endef define U-Boot/rk3588/Default BUILD_SUBTARGET:=armv8 DEPENDS:=+PACKAGE_u-boot-$(1):rkbin-rk3588 - ATF:=rk3588_bl31_v1.47.elf - TPL:=rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.18.bin + ATF:=rk3588_bl31_v1.45.elf + TPL:=rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin endef define U-Boot/generic-rk3588