From e5de37b791239a05d69c91e08a0b52749c4d63df Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 17 Jan 2021 16:01:34 +0000
Subject: [PATCH] iMX6: rework mkimage script for FDTDIR changes

---
 projects/NXP/devices/iMX6/bootloader/mkimage | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/projects/NXP/devices/iMX6/bootloader/mkimage b/projects/NXP/devices/iMX6/bootloader/mkimage
index ce686bcff0..1cdf3ca848 100644
--- a/projects/NXP/devices/iMX6/bootloader/mkimage
+++ b/projects/NXP/devices/iMX6/bootloader/mkimage
@@ -2,11 +2,25 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 if [ -f "$RELEASE_DIR/3rdparty/bootloader/u-boot.img" ]; then
-  echo "Writing u-boot.img to $(basename $DISK)"
+  echo "image: writing u-boot.img to $(basename $DISK)"
   dd if="$RELEASE_DIR/3rdparty/bootloader/u-boot.img" of="$DISK" bs=1K seek=69 conv=fsync,notrunc >"$SAVE_ERROR" 2>&1 || show_error
 fi
 
 if [ -f "$RELEASE_DIR/3rdparty/bootloader/SPL" ]; then
-  echo "Writing SPL to $(basename $DISK)"
+  echo "image: writing SPL to $(basename $DISK)"
   dd if="$RELEASE_DIR/3rdparty/bootloader/SPL" of="$DISK" bs=1K seek=1 conv=fsync,notrunc >"$SAVE_ERROR" 2>&1 || show_error
 fi
+
+echo "image: copying device trees"
+mcopy -s -o "${RELEASE_DIR}/3rdparty/bootloader"/imx6d*${UBOOT_SYSTEM}*.dtb ::
+mcopy -s -o "${RELEASE_DIR}/3rdparty/bootloader"/imx6q*${UBOOT_SYSTEM}*.dtb ::
+
+echo "image: copying exlinux.conf"
+mkdir -p "${LE_TMP}/extlinux"
+cat << EOF > "${LE_TMP}/extlinux/extlinux.conf"
+LABEL ${DISTRO}
+  LINUX /${KERNEL_NAME}
+  FDTDIR /
+  APPEND boot=UUID=${UUID_SYSTEM} disk=UUID=${UUID_STORAGE} quiet ${EXTRA_CMDLINE}
+EOF
+mcopy -s -o "${LE_TMP}/extlinux" ::