From 929886eeeab7b5d338ef35a6bd57dc1090ab5951 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Thu, 19 Dec 2024 09:47:07 +0100
Subject: [PATCH] meta-digi-arm: ccmp25-dvk: fix boot artifact names

Based on the boot schemes and sources supported for each platform, the boot
artifacts now include this information in their filenames. This commit updates
the filenames accordingly in several recipes.

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 meta-digi-arm/conf/machine/ccmp25-dvk.conf                  | 6 +++---
 .../trusted-firmware-a/tf-a-stm32mp_2.10.bbappend           | 4 ++--
 .../u-boot/u-boot-dey/ccmp2/install_linux_fw_sd.txt         | 4 ++--
 .../u-boot/u-boot-dey/ccmp2/install_linux_fw_usb.txt        | 4 ++--
 .../u-boot/u-boot-dey/ccmp2/install_linux_fw_uuu.sh         | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf
index 889df6564..ebe67936e 100644
--- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf
@@ -142,9 +142,9 @@ ST_USERFS   = "0"
 
 # Boot artifacts to be copied from the deploy dir to the installer ZIP
 BOOTABLE_ARTIFACTS = " \
-    arm-trusted-firmware/tf-a-ccmp25-dvk-emmc.stm32 \
-    fip/fip-ccmp25-dvk-optee.bin \
-    metadata-ccmp25-dvk.bin \
+    arm-trusted-firmware/tf-a-ccmp25-dvk-optee-emmc.stm32 \
+    arm-trusted-firmware/metadata-ccmp25-dvk.bin \
+    fip/fip-ccmp25-dvk-optee-emmc.bin \
 "
 
 # Per-machine DISTRO_FEATURES customization
diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend
index 1d27256bc..90db74b02 100644
--- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend
+++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend
@@ -68,8 +68,8 @@ do_deploy:append() {
 
     # Last value of 'dt' is good for metadata binary, so use that.
     if [ "${TF_A_ENABLE_METADATA}" = "1" ]; then
-            if [ -f "${DEPLOYDIR}/arm-trusted-firmware/${TF_A_METADATA_BINARY}" ]; then
-                ln -s "arm-trusted-firmware/${TF_A_METADATA_BINARY}" "${DEPLOYDIR}/${TF_A_METADATA_NAME}-${dt}.${TF_A_METADATA_SUFFIX}"
+            if [ -f "${DEPLOYDIR}/${TF_A_METADATA_BINARY}" ]; then
+                ln -s "${TF_A_METADATA_BINARY}" "${DEPLOYDIR}/${TF_A_METADATA_NAME}-${dt}.${TF_A_METADATA_SUFFIX}"
             fi
     fi
 
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_sd.txt
index ce1f67f7a..958bc1da0 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_sd.txt
@@ -7,9 +7,9 @@
 install_abort=0
 BASEFILENAME=0
 
-setenv INSTALL_ATF_FILENAME tf-a-##MACHINE##-emmc.stm32
+setenv INSTALL_ATF_FILENAME tf-a-##MACHINE##-optee-emmc.stm32
 setenv INSTALL_METADATA_FILENAME metadata-##MACHINE##.bin
-setenv INSTALL_FIP_FILENAME fip-##MACHINE##-optee.bin
+setenv INSTALL_FIP_FILENAME fip-##MACHINE##-optee-emmc.bin
 setenv INSTALL_MMCDEV 2
 
 if test -z "${image-name}"; then
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_usb.txt
index ba95d5915..7c7e97106 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_usb.txt
@@ -7,9 +7,9 @@
 install_abort=0
 BASEFILENAME=0
 
-setenv INSTALL_ATF_FILENAME tf-a-##MACHINE##-emmc.stm32
+setenv INSTALL_ATF_FILENAME tf-a-##MACHINE##-optee-emmc.stm32
 setenv INSTALL_METADATA_FILENAME metadata-##MACHINE##.bin
-setenv INSTALL_FIP_FILENAME fip-##MACHINE##-optee.bin
+setenv INSTALL_FIP_FILENAME fip-##MACHINE##-optee-emmc.bin
 setenv INSTALL_USBDEV 0
 
 if test -z "${image-name}"; then
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_uuu.sh
index 09eff2c20..a4bb3eeda 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_uuu.sh
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp2/install_linux_fw_uuu.sh
@@ -108,13 +108,13 @@ echo "Determining image files to use..."
 
 # Determine ATF file to program
 if [ -z "${INSTALL_ATF_FILENAME}" ]; then
-	INSTALL_ATF_FILENAME="tf-a-##MACHINE##-emmc.stm32##SIGNED_TFA##"
+	INSTALL_ATF_FILENAME="tf-a-##MACHINE##-optee-emmc.stm32##SIGNED_TFA##"
 fi
 INSTALL_METADATA_FILENAME="metadata-##MACHINE##.bin"
 
 # Determine FIP file to program
 if [ -z "${INSTALL_FIP_FILENAME}" ]; then
-	INSTALL_FIP_FILENAME="fip-##MACHINE##-optee##SIGNED##.bin"
+	INSTALL_FIP_FILENAME="fip-##MACHINE##-optee-emmc##SIGNED##.bin"
 fi
 
 # remove redirect