From: Stijn Tintel <stijn@linux-ipv6.be>
Date: Tue, 18 Mar 2025 08:53:46 +0000 (+0200)
Subject: arm-trusted-firmware-rockchip: bump to 2.12.1 LTS
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=b1a2ebbd43cbbc0ce54438cf06dd11b24d1c7e74;p=openwrt%2Fstaging%2Fxback.git

arm-trusted-firmware-rockchip: bump to 2.12.1 LTS

And remove no-warn-rwx-segments hack, as this is no longer needed and
actually causes build to fail. See also commit c117d7a37a74
("include/trusted-firmware-a.mk: remove the no-warn-rwx-segments hack").

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
---

diff --git a/package/boot/arm-trusted-firmware-rockchip/Makefile b/package/boot/arm-trusted-firmware-rockchip/Makefile
index 9073afe365..b517c9e37d 100644
--- a/package/boot/arm-trusted-firmware-rockchip/Makefile
+++ b/package/boot/arm-trusted-firmware-rockchip/Makefile
@@ -7,10 +7,11 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=2.10
+PKG_VERSION:=2.12.1
 PKG_RELEASE:=1
+PKG_LTS:=1
 
-PKG_HASH:=88215a62291b9ba87da8e50b077741103cdc08fb6c9e1ebd34dfaace746d3201
+PKG_HASH:=c0d432a851da452d927561feaf45f569c1cde57985782beadfe29e616e260440
 
 PKG_MAINTAINER:=Sarah Maedel <openwrt@tbspace.de>
 
@@ -37,9 +38,6 @@ TFA_TARGETS:= \
 	rk3328 \
 	rk3399
 
-TFA_MAKE_FLAGS+= \
-	$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments")
-
 ifeq ($(BUILD_VARIANT),rk3399)
   M0_GCC_NAME:=gcc-arm
   M0_GCC_RELEASE:=11.2-2022.02