From 437b0786563c279bc8af36dcb4c42849b3c11c94 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 25 Apr 2023 12:51:28 +0800 Subject: [PATCH] arm-trusted-firmware-rockchip: bump to linux-5.10-gen-rkr3.6 Signed-off-by: Tianling Shen --- package/boot/arm-trusted-firmware-rockchip/Makefile | 10 +++++----- .../boot/arm-trusted-firmware-rockchip/atf-version.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/boot/arm-trusted-firmware-rockchip/Makefile b/package/boot/arm-trusted-firmware-rockchip/Makefile index 3ff4e9c4e0..ca3f9bb73d 100644 --- a/package/boot/arm-trusted-firmware-rockchip/Makefile +++ b/package/boot/arm-trusted-firmware-rockchip/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/trusted-firmware-a.mk PKG_NAME:=rkbin -PKG_VERSION:=linux-5.10-gen-rkr3.5 +PKG_VERSION:=linux-5.10-gen-rkr3.6 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://gitlab.com/rk3588_linux/rk/rkbin/-/archive/$(PKG_VERSION)/ -PKG_HASH:=012b0d7bdc269480f38ccc06d6f2e88fd794e05f2227184989aa9863279c90ca +PKG_HASH:=ab2cfa417554e949b9bbac051a5fca1d1b1668d7c9cbd1af51320b9970ceb49a PKG_MAINTAINER:=Tianling Shen @@ -57,7 +57,7 @@ TFA_TARGETS:= \ define Build/Compile # This comment is the workaround for "extraneous 'endif'" error -ifneq ($(filter rk33%,$(BUILD_VARIANT)),) +ifneq ($(LOADER),) ( \ pushd $(PKG_BUILD_DIR) ; \ $(SED) 's,$$$$(PKG_BUILD_DIR),$(PKG_BUILD_DIR),g' trust.ini ; \ @@ -75,11 +75,11 @@ define Package/trusted-firmware-a/install $(INSTALL_DIR) $(STAGING_DIR_IMAGE) $(CP) $(PKG_BUILD_DIR)/bin/$(ATF) $(STAGING_DIR_IMAGE)/ -ifneq ($(filter rk33%,$(BUILD_VARIANT)),) +ifneq ($(LOADER),) $(CP) $(PKG_BUILD_DIR)/tools/loaderimage $(STAGING_DIR_IMAGE)/ $(CP) $(PKG_BUILD_DIR)/$(BUILD_VARIANT)-idbloader.bin $(STAGING_DIR_IMAGE)/ $(CP) $(PKG_BUILD_DIR)/$(BUILD_VARIANT)-trust.bin $(STAGING_DIR_IMAGE)/ -else ifneq ($(filter rk35%,$(BUILD_VARIANT)),) +else $(CP) $(PKG_BUILD_DIR)/bin/$(DDR) $(STAGING_DIR_IMAGE)/ endif endef diff --git a/package/boot/arm-trusted-firmware-rockchip/atf-version.mk b/package/boot/arm-trusted-firmware-rockchip/atf-version.mk index f2324e3d51..977200b6dc 100644 --- a/package/boot/arm-trusted-firmware-rockchip/atf-version.mk +++ b/package/boot/arm-trusted-firmware-rockchip/atf-version.mk @@ -9,5 +9,5 @@ RK3399_LOADER:=rk3399_miniloader_v1.26.bin RK3568_ATF:=rk3568_bl31_v1.36.elf RK3568_DDR:=rk3568_ddr_1560MHz_v1.15.bin -RK3588_ATF:=rk3588_bl31_v1.32.elf +RK3588_ATF:=rk3588_bl31_v1.33.elf RK3588_DDR:=rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v1.09.bin