From f9427d1641aa4e8021ab44f7389b28dbfd4c2e9c Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Tue, 25 Sep 2018 10:59:57 +0200
Subject: [PATCH] ccimx8x: u-boot: deploy all u-boot files to the
 imx-boot-tools directory

This way, customers are less likely to flash the plain u-boot by accident
instead of imx-boot. Also, have the imx-boot recipe look for the u-boot files
in the imx-boot-tools directory.

https://jira.digi.com/browse/DEL-6185

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bb  | 7 ++-----
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 9 +++++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bb b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bb
index ce67c406d..a8ee69487 100644
--- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bb
+++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_0.2.bb
@@ -122,7 +122,7 @@ do_compile () {
         cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${SC_FIRMWARE_NAME} ${S}/${SOC_TARGET}/scfw_tcm.bin
         cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${ATF_MACHINE_NAME} ${S}/${SOC_TARGET}/bl31.bin
         for type in ${UBOOT_CONFIG}; do
-            cp ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME}-${type}         ${S}/${SOC_TARGET}/u-boot.bin-${type}
+            cp ${DEPLOY_DIR_IMAGE}/${BOOT_TOOLS}/${UBOOT_NAME}-${type}         ${S}/${SOC_TARGET}/u-boot.bin-${type}
         done
     fi
 
@@ -167,10 +167,7 @@ DEPLOYDIR_IMXBOOT = "${BOOT_TOOLS}"
 do_deploy () {
     install -d ${DEPLOYDIR}/${DEPLOYDIR_IMXBOOT}
 
-    # copy the tool mkimage to deploy path and sc fw, dcd and uboot
-    for type in ${UBOOT_CONFIG}; do
-        install -m 0644 ${DEPLOY_DIR_IMAGE}/${UBOOT_NAME}-${type} ${DEPLOYDIR}/${DEPLOYDIR_IMXBOOT}
-    done
+    # copy the tool mkimage to deploy path along with sc fw and dcd
     if [ "${SOC_TARGET}" = "iMX8M" ]; then
         install -m 0644 ${DEPLOY_DIR_IMAGE}/u-boot-spl.bin-${MACHINE}-${UBOOT_CONFIG} ${DEPLOYDIR}/${DEPLOYDIR_IMXBOOT}
         for ddr_firmware in ${DDR_FIRMWARE_NAME}; do
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
index 54f0b1958..6864b9fc3 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb
@@ -169,4 +169,13 @@ do_deploy_append() {
 	rm -f ${TMP_BOOTSCR}
 }
 
+BOOT_TOOLS = "imx-boot-tools"
+
+do_deploy_append_ccimx8x() {
+	# Move all U-Boot artifacts to the imx-boot-tools folder
+	# U-Boot images are not bootable on the i.MX8X
+	install -d ${DEPLOYDIR}/${BOOT_TOOLS}
+	mv ${DEPLOYDIR}/u-boot* ${DEPLOYDIR}/${BOOT_TOOLS}/
+}
+
 COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)"