From 019deb63139d079b35fd3769d5061c6089461294 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Wed, 11 Oct 2023 12:41:20 +0200
Subject: [PATCH] tf-a-stm32mp: create symlinks on deploydir to TF-A and FIP
 binaries

These binaries are installed in subdirectories by default. The uuu
installer expects to find all binaries on the same folder where the script
is. By creating symlinks, the uuu installer can find all the binaries it
needs directly on the deploy folder.

NOTE: variables in 'for' clauses are intentionally without quotes to skip
whitespaces in them.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 .../tf-a-stm32mp_%.bbappend                   | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend
index 31a8c57c4..4aad85436 100644
--- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend
@@ -52,6 +52,39 @@ python set_fip_sign_key() {
                 d.setVar('FIP_SIGN_KEY_PASS', p[i])
 }
 
+do_deploy:append() {
+	unset i
+	for config in ${TF_A_CONFIG}; do
+		i=$(expr $i + 1)
+		# Initialize devicetree list and tf-a basename
+		dt_config=$(echo ${TF_A_DEVICETREE} | cut -d',' -f${i})
+		tfa_basename=$(echo ${TF_A_BINARIES} | cut -d',' -f${i})
+		for dt in ${dt_config}; do
+			TF_A_FILENAME="${tfa_basename}-${dt}-${config}.${TF_A_SUFFIX}"
+			if [ -f "${DEPLOYDIR}/arm-trusted-firmware/${TF_A_FILENAME}" ]; then
+				cd "${DEPLOYDIR}"
+				# symlink TF-A
+				ln -s "arm-trusted-firmware/${TF_A_FILENAME}" "${DEPLOYDIR}/"
+			fi
+		done
+	done
+
+	unset i
+	for config in ${FIP_CONFIG}; do
+		i="$(expr ${i} + 1)"
+		dt_config="$(echo ${FIP_DEVICETREE} | cut -d',' -f${i})"
+		for dt in ${dt_config}; do
+			FIP_FILENAME="${FIP_BASENAME}-${dt}-${config}.${FIP_SUFFIX}"
+			echo "${FIP_FILENAME}"
+			if [ -f "${DEPLOYDIR}/fip/${FIP_FILENAME}" ]; then
+				cd "${DEPLOYDIR}"
+				# symlink FIP
+				ln -s "fip/${FIP_FILENAME}" "${DEPLOYDIR}/"
+			fi
+		done
+	done
+}
+
 # Sign TF-A image
 do_deploy[postfuncs] += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'tfa_sign', '', d)}"
 tfa_sign() {