diff --git a/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile b/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile index 88e9c070d..6e89d0922 100644 --- a/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile +++ b/package/boot/arm-trusted-firmware-rockchip-vendor/Makefile @@ -37,18 +37,18 @@ define Package/arm-trusted-firmware-rk3399 VARIANT:=rk3399 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 Package/arm-trusted-firmware-rk3588 - $(Package/arm-trusted-firmware-rockchip-vendor) - DEPENDS:=@TARGET_rockchip_armv8 - VARIANT:=rk3588 -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 @@ -69,13 +69,13 @@ endef define Package/arm-trusted-firmware-rk3399/install endef -define Package/arm-trusted-firmware-rk3568/install +define Package/arm-trusted-firmware-rk3566/install endef -define Package/arm-trusted-firmware-rk3588/install +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,arm-trusted-firmware-rk3588)) diff --git a/package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh b/package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh index 6dfb89172..889ab6233 100755 --- a/package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh +++ b/package/boot/arm-trusted-firmware-rockchip-vendor/pack-firmware.sh @@ -17,13 +17,13 @@ case "$VARIANT" in DDR="rk33/rk3399_ddr_800MHz_v1.27.bin" LOADER="rk33/rk3399_miniloader_v1.26.bin" ;; -"rk3568") - ATF="rk35/rk3568_bl31_v1.28.elf" - DDR="rk35/rk3568_ddr_1560MHz_v1.13.bin" +"rk3566") + ATF="rk35/rk3568_bl31_v1.34.elf" + DDR="rk35/rk3566_ddr_1056MHz_v1.13.bin" ;; -"rk3588") - ATF="rk35/rk3588_bl31_v1.27.elf" - DDR="rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.08.bin" +"rk3568") + ATF="rk35/rk3568_bl31_v1.34.elf" + DDR="rk35/rk3568_ddr_1560MHz_v1.13.bin" ;; *) echo -e "Not compatible with your platform: $VARIANT." diff --git a/package/boot/arm-trusted-firmware-rockchip-vendor/src/bin/rk35/rk3568_bl31_v1.28.elf b/package/boot/arm-trusted-firmware-rockchip-vendor/src/bin/rk35/rk3568_bl31_v1.28.elf deleted file mode 100644 index 459d06627..000000000 Binary files a/package/boot/arm-trusted-firmware-rockchip-vendor/src/bin/rk35/rk3568_bl31_v1.28.elf and /dev/null differ diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile index bc3297efa..3826317dc 100644 --- a/package/boot/uboot-rockchip/Makefile +++ b/package/boot/uboot-rockchip/Makefile @@ -167,7 +167,7 @@ define U-Boot/mrkaio-m68s-rk3568 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.28.elf + ATF:=rk3568_bl31_v1.34.elf DDR:=rk3568_ddr_1560MHz_v1.13.bin endef @@ -179,7 +179,7 @@ define U-Boot/nanopi-r5s-rk3568 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.28.elf + ATF:=rk3568_bl31_v1.34.elf DDR:=rk3568_ddr_1560MHz_v1.13.bin endef @@ -192,7 +192,7 @@ define U-Boot/opc-h68k-rk3568 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.28.elf + ATF:=rk3568_bl31_v1.34.elf DDR:=rk3568_ddr_1560MHz_v1.13.bin endef @@ -203,7 +203,7 @@ define U-Boot/photonicat-rk3568 ariaboard_photonicat DEPENDS:=+PACKAGE_u-boot-photonicat-rk3568:arm-trusted-firmware-rk3568 PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor - ATF:=rk3568_bl31_v1.28.elf + ATF:=rk3568_bl31_v1.34.elf DDR:=rk3568_ddr_1560MHz_v1.13.bin endef @@ -214,7 +214,7 @@ define U-Boot/radxa-e25-rk3568 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.28.elf + ATF:=rk3568_bl31_v1.34.elf DDR:=rk3568_ddr_1560MHz_v1.13.bin endef @@ -225,7 +225,7 @@ define U-Boot/rock-3a-rk3568 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.28.elf + ATF:=rk3568_bl31_v1.34.elf DDR:=rk3568_ddr_1560MHz_v1.13.bin endef @@ -237,7 +237,7 @@ define U-Boot/r66s-rk3568 fastrhino_r68s DEPENDS:=+PACKAGE_u-boot-r66s-rk3568:arm-trusted-firmware-rk3568 PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor - ATF:=rk3568_bl31_v1.28.elf + ATF:=rk3568_bl31_v1.34.elf DDR:=rk3568_ddr_1560MHz_v1.13.bin endef @@ -248,7 +248,7 @@ define U-Boot/station-p2-rk3568 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.28.elf + ATF:=rk3568_bl31_v1.34.elf DDR:=rk3568_ddr_1560MHz_v1.13.bin endef