From e9c7bb39d60bd8d03ba187174413ea0a83849d88 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 26 Jan 2023 22:31:33 +0800 Subject: [PATCH] arm-trusted-firmware-rockchip: bump to linux-5.10-gen-rkr3.5 Signed-off-by: Tianling Shen --- .../boot/arm-trusted-firmware-rockchip/Makefile | 14 ++++++-------- .../arm-trusted-firmware-rockchip/pack-firmware.sh | 12 ++++++------ package/boot/uboot-rockchip/Makefile | 2 +- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/package/boot/arm-trusted-firmware-rockchip/Makefile b/package/boot/arm-trusted-firmware-rockchip/Makefile index c5d816fe17..f318095561 100644 --- a/package/boot/arm-trusted-firmware-rockchip/Makefile +++ b/package/boot/arm-trusted-firmware-rockchip/Makefile @@ -1,22 +1,20 @@ # SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2021 ImmortalWrt.org +# Copyright (C) 2021-2023 ImmortalWrt.org include $(TOPDIR)/rules.mk PKG_NAME:=arm-trusted-firmware-rockchip +PKG_VERSION:=linux-5.10-gen-rkr3.5 PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL=https://github.com/rockchip-linux/rkbin.git -PKG_SOURCE_DATE:=2022-08-01 -PKG_SOURCE_VERSION:=b0c100f1a260d807df450019774993c761beb79d -PKG_MIRROR_HASH:=bdf84d7ce55294591dfe491cb87d8ecda939fea984a050762b2537e121ee57e0 +PKG_SOURCE:=rkbin-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL=https://gitlab.com/rk3588_linux/rk/rkbin/-/archive/$(PKG_VERSION)/ +PKG_HASH:=012b0d7bdc269480f38ccc06d6f2e88fd794e05f2227184989aa9863279c90ca +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/rkbin-$(PKG_VERSION) PKG_MAINTAINER:=Tianling Shen -MAKE_PATH:=$(PKG_NAME) - include $(INCLUDE_DIR)/package.mk define Package/arm-trusted-firmware-rockchip diff --git a/package/boot/arm-trusted-firmware-rockchip/pack-firmware.sh b/package/boot/arm-trusted-firmware-rockchip/pack-firmware.sh index 9245721641..64762c4fc9 100755 --- a/package/boot/arm-trusted-firmware-rockchip/pack-firmware.sh +++ b/package/boot/arm-trusted-firmware-rockchip/pack-firmware.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2021 ImmortalWrt.org +# Copyright (C) 2021-2023 ImmortalWrt.org set -e @@ -16,19 +16,19 @@ case "$VARIANT" in ;; "rk3399") ATF="rk33/rk3399_bl31_v1.35.elf" - DDR="rk33/rk3399_ddr_800MHz_v1.27.bin" + DDR="rk33/rk3399_ddr_800MHz_v1.28.bin" LOADER="rk33/rk3399_miniloader_v1.26.bin" ;; "rk3568") ATF="rk35/rk3568_bl31_v1.28.elf" - DDR="rk35/rk3568_ddr_1560MHz_v1.13.bin" + DDR="rk35/rk3568_ddr_1560MHz_v1.15.bin" ;; "rk3588") - ATF="rk35/rk3588_bl31_v1.27.elf" - DDR="rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.08.bin" + ATF="rk35/rk3588_bl31_v1.32.elf" + DDR="rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.09.bin" ;; *) - echo -e "Not compatible with your platform: $VARIANT." + echo -e "Unsupported platform: $VARIANT." exit 1 ;; esac diff --git a/package/boot/uboot-rockchip/Makefile b/package/boot/uboot-rockchip/Makefile index f7f123977e..7cb043d5ec 100644 --- a/package/boot/uboot-rockchip/Makefile +++ b/package/boot/uboot-rockchip/Makefile @@ -102,7 +102,7 @@ define U-Boot/Default/rk3568 BUILD_SUBTARGET:=armv8 DEPENDS:=+PACKAGE_u-boot-$(1):arm-trusted-firmware-rk3568 ATF:=rk3568_bl31_v1.28.elf - DDR:=rk3568_ddr_1560MHz_v1.13.bin + DDR:=rk3568_ddr_1560MHz_v1.15.bin endef define U-Boot/fastrhino-r66s-rk3568