arm-trusted-firmware-mediatek: update to upstream release 2025-02-12

Rebased MediaTek's SoC support patchset on top of upstream ARM
TrustedFirmware-A v2.12+.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/package/boot/arm-trusted-firmware-mediatek/Makefile b/package/boot/arm-trusted-firmware-mediatek/Makefile
index 3046a01a586ae416cffb9205b0651cbab224b92a..0b68d510c5b6b7f984e75d0059d9f5b45cd75422 100644 (file)
--- a/package/boot/arm-trusted-firmware-mediatek/Makefile
+++ b/package/boot/arm-trusted-firmware-mediatek/Makefile
@@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=arm-trusted-firmware-mediatek
-PKG_RELEASE:=3
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=https://github.com/mtk-openwrt/arm-trusted-firmware.git
-PKG_SOURCE_DATE:=2024-01-17
-PKG_SOURCE_VERSION:=bacca82a8cac369470df052a9d801a0ceb9b74ca
-PKG_MIRROR_HASH:=1138649f64ac3982330925c38c795ca6860289adbd95755991f80afa30ebdea7
+PKG_SOURCE_DATE:=2025-02-12
+PKG_SOURCE_VERSION:=e090770684e775711a624e68e0b28112227a4c38
+PKG_MIRROR_HASH:=1ff9d60f3677aadd9a6716e860985987ba7157bd28ce831112e05c0b3170939a
 
 PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
 
@@ -569,7 +569,6 @@ TFA_TARGETS:= \
        mt7988-spim-nand-ubi-comb
 
 TFA_MAKE_FLAGS += \
-       $(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
        BOOT_DEVICE=$(BOOT_DEVICE) \
        USE_MKIMAGE=1 MKIMAGE=$(STAGING_DIR_HOST)/bin/mkimage \
        $(if $(findstring ddr4,$(DDR_TYPE)),DRAM_USE_DDR4=1) \

diff --git a/package/boot/arm-trusted-firmware-mediatek/patches/0004-mediatek-snfi-fix-return-code-when-reading.patch b/package/boot/arm-trusted-firmware-mediatek/patches/0004-mediatek-snfi-fix-return-code-when-reading.patch
index 857ecd0595801735d681e21a5509b0297afcdaf1..8ac52143a70a54cc8e1cc4f82400e1662c3b7b37 100644 (file)
--- a/package/boot/arm-trusted-firmware-mediatek/patches/0004-mediatek-snfi-fix-return-code-when-reading.patch
+++ b/package/boot/arm-trusted-firmware-mediatek/patches/0004-mediatek-snfi-fix-return-code-when-reading.patch
@@ -13,15 +13,19 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 
 --- a/plat/mediatek/apsoc_common/bl2/bl2_dev_snfi_init.c
 +++ b/plat/mediatek/apsoc_common/bl2/bl2_dev_snfi_init.c
-@@ -29,8 +29,10 @@ static int snfi_mtd_read_page(struct nan
+@@ -30,9 +30,14 @@ static int snfi_mtd_read_page(struct nan
        int ret;
  
        ret = mtk_snand_read_page(snf, addr, (void *)buffer, NULL, false);
--      if (ret == -EBADMSG)
+-      if (ret == -EBADMSG || ret > 0)
++      if (ret == -EBADMSG)
+               ret = 0;
+ 
 +      if (ret > 0) {
 +              NOTICE("corrected %d bitflips while reading page %u\n", ret, page);
-               ret = 0;
++              ret = 0;
 +      }
- 
++
        return ret;
  }
+