From a2bb190cef858d8db0ae0df367b751eb0113d3c3 Mon Sep 17 00:00:00 2001
From: Christian Hewitt <christianshewitt@gmail.com>
Date: Sun, 17 Jan 2021 16:09:17 +0000
Subject: [PATCH] iMX6: minor cleanup to update.sh script

---
 projects/NXP/devices/iMX6/bootloader/update.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/projects/NXP/devices/iMX6/bootloader/update.sh b/projects/NXP/devices/iMX6/bootloader/update.sh
index be22a0becb..811e677429 100755
--- a/projects/NXP/devices/iMX6/bootloader/update.sh
+++ b/projects/NXP/devices/iMX6/bootloader/update.sh
@@ -20,23 +20,21 @@ fi
 # mount $BOOT_ROOT r/w
   mount -o remount,rw $BOOT_ROOT
 
-# update Device Tree Blobs
-  for all_dtb in /flash/*.dtb; do
-    dtb=$(basename $all_dtb)
-    if [ -f $SYSTEM_ROOT/usr/share/bootloader/$dtb ]; then
-      echo "*** updating Device Tree Blob: $dtb ..."
-      cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT
-    fi
+# update extlinux device trees
+  for dtbfile in $BOOT_ROOT/*.dtb; do
+    dtb=$(basename $dtbfile)
+    echo "Updating $dtb"
+    cp -p $SYSTEM_ROOT/usr/share/bootloader/$dtb $BOOT_ROOT/ 2>/dev/null || true
   done
 
 # update bootloader files
   if [ -f $SYSTEM_ROOT/usr/share/bootloader/u-boot.img ]; then
-    echo "*** updating u-boot image on: $BOOT_DISK ..."
+    echo "Updating u-boot image on $BOOT_DISK"
     dd if=$SYSTEM_ROOT/usr/share/bootloader/u-boot.img of="$BOOT_DISK" bs=1K seek=69 conv=fsync &>/dev/null
   fi
 
   if [ -f $SYSTEM_ROOT/usr/share/bootloader/SPL ]; then
-    echo "*** updating u-boot SPL Blob on: $BOOT_DISK ..."
+    echo "Updating u-boot SPL on $BOOT_DISK"
     dd if=$SYSTEM_ROOT/usr/share/bootloader/SPL of="$BOOT_DISK" bs=1k seek=1 conv=fsync &>/dev/null
   fi