[DistroKit] [PATCH 1/5] v7a: tf-a: version bump v2.12 -> v2.14

[Roland Hieber <rhi@pengutronix.de>]

Update to the new version, which includes support for the Linux
Automation FairyTux 2. A regression prevents building the LXA TAC, so
add a patch, which is currently in upstream review.

Helped-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 ...upport-for-multiple-entries-in-DTB_F.patch | 58 +++++++++++++++++++
 .../platform-v7a/patches/tf-a-v2.14/series    |  4 ++
 configs/platform-v7a/platformconfig           |  4 +-
 3 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 configs/platform-v7a/patches/tf-a-v2.14/0001-fix-st-restore-support-for-multiple-entries-in-DTB_F.patch
 create mode 100644 configs/platform-v7a/patches/tf-a-v2.14/series

diff --git a/configs/platform-v7a/patches/tf-a-v2.14/0001-fix-st-restore-support-for-multiple-entries-in-DTB_F.patch b/configs/platform-v7a/patches/tf-a-v2.14/0001-fix-st-restore-support-for-multiple-entries-in-DTB_F.patch
new file mode 100644
index 000000000000..bd1502a75b90
--- /dev/null
+++ b/configs/platform-v7a/patches/tf-a-v2.14/0001-fix-st-restore-support-for-multiple-entries-in-DTB_F.patch
@@ -0,0 +1,58 @@
+From: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Date: Mon, 2 Feb 2026 16:49:02 +0100
+Subject: [PATCH] fix(st): restore support for multiple entries in
+ DTB_FILE_NAME
+
+Commit e772a6d1864a ("stm32mp1: platform.mk: support generating multiple
+images in one build") allowed DTB_FILE_NAME to contain multiple entries,
+thereby allowing to build all the executable code once and then link it
+against each device tree one by one.
+
+This makes for easier build system integration as one recipe/package can
+generate multiple images at once.
+
+This was broken by below mentioned commit, because it assumed
+DTB_FILE_NAME to contain only a single entry. Rework the -sp_min suffix
+logic to fix this regression.
+
+Fixes: 71ba1647e09c ("feat(st): use dedicated version of DT for SP_MIN")
+Change-Id: Ib596a404ccda92c3a3c29e276930a74f147734fc
+Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Upstream-Status: Submitted; https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/47888
+---
+ plat/st/stm32mp1/platform.mk | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/plat/st/stm32mp1/platform.mk b/plat/st/stm32mp1/platform.mk
+index 96856f88ba3a..8cb5e41a0488 100644
+--- a/plat/st/stm32mp1/platform.mk
++++ b/plat/st/stm32mp1/platform.mk
+@@ -109,14 +109,14 @@ FDT_SOURCES		:=	$(addprefix ${BUILD_PLAT}/fdts/, $(patsubst %.dtb,%-bl2.dts,$(DT
+ ifeq ($(AARCH32_SP),sp_min)
+ BL32_DTSI		:=	stm32mp15-bl32.dtsi
+ FDT_SOURCES		+=	$(addprefix ${BUILD_PLAT}/fdts/, $(patsubst %.dtb,%-bl32.dts,$(DTB_FILE_NAME)))
+-ifneq (,$(wildcard $(patsubst %.dtb,fdts/%-sp_min.dts,$(DTB_FILE_NAME))))
+-ifeq (,$(findstring -sp_min,$(DTB_FILE_NAME)))
+-SP_EXT			:=	-sp_min
+-endif
+-endif
+ endif
+ endif
+ 
++sp_dts_name = $(patsubst %.dts,%$(if $(and \
++    $(wildcard $(patsubst %.dts,fdts/%-sp_min.dts,$(notdir $(1)))), \
++    $(filter-out %-sp_min.dts,$(notdir $(1))) \
++  ),-sp_min).dts,$(notdir $(1)))
++
+ # Macros and rules to build TF binary
+ STM32_TF_STM32		:=	$(addprefix ${BUILD_PLAT}/tf-a-, $(patsubst %.dtb,%.stm32,$(DTB_FILE_NAME)))
+ STM32_LD_FILE		:=	plat/st/stm32mp1/stm32mp1.ld.S
+@@ -273,7 +273,7 @@ BL2_SOURCES		+=	plat/st/stm32mp1/plat_ddr.c
+ ifeq ($(AARCH32_SP),sp_min)
+ # Create DTB file for BL32
+ ${BUILD_PLAT}/fdts/%-bl32.dts: fdts/%.dts fdts/${BL32_DTSI} | $$(@D)/
+-	$(q)echo '#include "$(patsubst %.dts,%$(SP_EXT).dts,$(patsubst fdts/%,%,$<))"' > $@
++	$(q)echo '#include "$(call sp_dts_name,$(patsubst fdts/%,%,$<))"' > $@
+ 	$(q)echo '#include "${BL32_DTSI}"' >> $@
+ 
+ ${BUILD_PLAT}/fdts/%-bl32.dtb: ${BUILD_PLAT}/fdts/%-bl32.dts | $$(@D)/
diff --git a/configs/platform-v7a/patches/tf-a-v2.14/series b/configs/platform-v7a/patches/tf-a-v2.14/series
new file mode 100644
index 000000000000..06810e63ab39
--- /dev/null
+++ b/configs/platform-v7a/patches/tf-a-v2.14/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fix-st-restore-support-for-multiple-entries-in-DTB_F.patch
+# a5e0fa7c9e5657bac6944003d7969162  - git-ptx-patches magic
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index f3b380cfaee3..be011f93f8de 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -228,8 +228,8 @@ PTXCONF_OPTEE_CFG="CFG_TEE_CORE_LOG_LEVEL=2 CFG_WITH_PAGER=n CFG_GP_SOCKETS=n CF
 PTXCONF_TF_A_STM32MP13=y
 PTXCONF_TF_A=y
 PTXCONF_TF_A_URL="https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags"
-PTXCONF_TF_A_VERSION="v2.12"
-PTXCONF_TF_A_MD5="dea016f3707117c7935a8a26433a1e46 5b90a1c21210702e64234a2beb79f23a"
+PTXCONF_TF_A_VERSION="v2.14"
+PTXCONF_TF_A_MD5="c4c27a01a40d0608c326345df0990c38"
 PTXCONF_TF_A_ARCH_STRING="aarch32"
 PTXCONF_TF_A_ARM_ARCH_MAJOR_7=y
 # PTXCONF_TF_A_ARM_ARCH_MAJOR_8_32_BIT is not set
-- 
2.47.3