From 15ec9fe118984cc977016269c069571c4530ef8f Mon Sep 17 00:00:00 2001
From: Stefano Viola <stefano.viola@toradex.com>
Date: Wed, 23 Nov 2022 00:22:35 +0100
Subject: u-boot-toradex_2022.07: improve deploy of u-boot-with-spl.imx

The u-boot-with-spl.imx binary, now is deployed for each u-boot configuration
type and the condition that suppressed the error in case u-boot-with-spl.imx
was not generated has been removed.

Signed-off-by: Stefano Viola <stefano.viola@toradex.com>
---
 recipes-bsp/u-boot/u-boot-toradex_2022.07.bb | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-toradex_2022.07.bb b/recipes-bsp/u-boot/u-boot-toradex_2022.07.bb
index dcf7fff..b343eb7 100644
--- a/recipes-bsp/u-boot/u-boot-toradex_2022.07.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex_2022.07.bb
@@ -50,11 +50,25 @@ nand_padding () {
 }
 
 deploy_uboot_with_spl () {
-    for config in ${UBOOT_MACHINE}; do
-        if [ -f "${B}/${config}/u-boot-with-spl.imx" ]; then
-            install -D -m 644 ${B}/${config}/u-boot-with-spl.imx ${DEPLOYDIR}/u-boot-with-spl.imx
-        fi
-    done
+    #Deploy u-boot-with-spl.imx
+    if [ -n "${UBOOT_CONFIG}" ]
+    then
+        for config in ${UBOOT_MACHINE}; do
+            i=$(expr $i + 1);
+            for type in ${UBOOT_CONFIG}; do
+                j=$(expr $j + 1);
+                if [ $j -eq $i ]
+                then
+                    install -D -m 644 ${B}/${config}/u-boot-with-spl.imx ${DEPLOYDIR}/u-boot-with-spl.imx-${MACHINE}-${type}
+                    ln -sf u-boot-with-spl.imx-${MACHINE}-${type} ${DEPLOYDIR}/u-boot-with-spl.imx
+                fi
+            done
+            unset  j
+        done
+        unset  i
+    else
+        install -D -m 644 ${B}/${config}/u-boot-with-spl.imx ${DEPLOYDIR}/u-boot-with-spl.imx
+    fi
 }
 
 # build imx-boot from within U-Boot
-- 
cgit v1.2.3