From 763ddf471b7a791a53119a54eee9ec4c31c85dd9 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 3 Jan 2023 11:12:26 +0100
Subject: [PATCH] ccimx93: imx-boot: generate properly named boot artifacts

Although in theory, you can use any label to name the different u-boot
build configurations, we have them coupled to machine names in the
boot-artifacts bbclass, and also in the default boot artifact filename
in the firmware installation scripts.

So fix that up for the ccimx93 in the machine config, and create the
proper symlinks in the do_deploy imx-boot recipe.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 meta-digi-arm/conf/machine/ccimx93-dvk.conf               | 4 ++--
 .../recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend         | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccimx93-dvk.conf b/meta-digi-arm/conf/machine/ccimx93-dvk.conf
index 9470b0291..967aebb79 100644
--- a/meta-digi-arm/conf/machine/ccimx93-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx93-dvk.conf
@@ -5,8 +5,8 @@
 require include/ccimx93.inc
 
 # U-Boot configurations
-UBOOT_CONFIG ??= "ccimx93dvk"
-UBOOT_CONFIG[ccimx93dvk] = "ccimx93-dvk_defconfig"
+UBOOT_CONFIG ??= "ccimx93-dvk"
+UBOOT_CONFIG[ccimx93-dvk] = "ccimx93-dvk_defconfig"
 UBOOT_DTB_NAME = "ccimx93-dvk.dtb"
 
 KERNEL_DEVICETREE ?= " \
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
index 7573960ef..293b7b9d4 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
@@ -41,8 +41,12 @@ deploy_mx93() {
 }
 
 do_deploy:append() {
-	# DEY install scripts use by default INSTALL_UBOOT_FILENAME="imx-boot-##MACHINE##.bin"
-	ln -sf ${BOOT_CONFIG_MACHINE}-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/${BOOT_NAME}-${MACHINE}.bin
+	# The boot-artifacts.bbclass expects "imx-boot-<UBOOT_CONFIG>.bin" symlinks, so add them.
+	if [ -n "${UBOOT_CONFIG}" ]; then
+		for type in ${UBOOT_CONFIG}; do
+			ln -sf ${BOOT_NAME}-${MACHINE}-${type}.bin-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/${BOOT_NAME}-${type}.bin
+		done
+	fi
 }
 
 COMPATIBLE_MACHINE = "(mx8-generic-bsp|mx9-generic-bsp)"