From d59fab0cc9b59e48ff2e98cca25b9a31e4c1844f Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Thu, 11 Feb 2016 10:50:25 +0100
Subject: [PATCH] u-boot-dey: remove canonical symlinks and add new ones (per
 U-Boot config)

The canonical symlinks created by poky's U-Boot class in u-boot.inc for
the different U-Boot configs are in the form:
	u-boot.imx-<config>
	u-boot-<machine>.imx-<config>

These symlinks have the .imx file extension hidden in the middle of the
file name, which looks ugly.
For DEY, remove these unused symlinks and generate new ones in the form:
	u-boot-<config>.imx

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://jira.digi.com/browse/DEL-2192
---
 .../recipes-bsp/u-boot/u-boot-dey_2015.04.bb  | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
index 91c275413..3af8c312c 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb
@@ -27,6 +27,27 @@ inherit fsl-u-boot-localversion
 EXTRA_OEMAKE_append = " KCFLAGS=-fgnu89-inline"
 
 do_deploy_append() {
+	# Remove canonical U-Boot symlinks for ${UBOOT_CONFIG} currently in the form:
+	#    u-boot-<platform>.imx-<type>
+	#    u-boot-<type>
+	# and add a more suitable symlink in the form:
+	#    u-boot-<platform>-<config>.imx
+	if [ "x${UBOOT_CONFIG}" != "x" ]; 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
+					cd ${DEPLOYDIR}
+					rm -r ${UBOOT_BINARY}-${type} ${UBOOT_SYMLINK}-${type}
+					ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} u-boot-${type}.${UBOOT_SUFFIX}
+				fi
+			done
+			unset  j
+		done
+		unset  i
+	fi
+
 	# Boot script for DEY images
 	mkimage -T script -n bootscript -C none -d ${WORKDIR}/boot.txt ${DEPLOYDIR}/boot.scr
 }