From d5d561fc73d6cb1c21ee22a2061c04c955b98dee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Wed, 3 Oct 2018 14:34:08 +0200
Subject: [PATCH] scripts/kernel-write: group output for devicetree files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 scripts/include/machine-imx.inc         | 3 ++-
 scripts/include/machine-raspberrypi.inc | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/include/machine-imx.inc b/scripts/include/machine-imx.inc
index f12e344..055582c 100644
--- a/scripts/include/machine-imx.inc
+++ b/scripts/include/machine-imx.inc
@@ -41,9 +41,10 @@ RootCardKernelWriteCallback() {
     EvalExAuto "cp $DeployedFile $tmpdir/$KernelImageType" "\nCopy new kernel $KernelImageType..."
     # devicetrees
     EvalExAuto "rm -f $tmpdir/*.dtb" "\nRemove old devicetrees..."
+    echo
     for dtb in `find ${DeployFileDir} -name "${KernelImageType}*.dtb" -type l`; do
         dtbname=`basename $dtb | sed 's:'${KernelImageType}'-::'`
-        EvalExAuto "cp $dtb $tmpdir/${dtbname}" "\nCopy $dtb -> $tmpdir/${dtbname}..."
+        EvalExAuto "cp $dtb $tmpdir/${dtbname}" "Copy $dtb -> $tmpdir/${dtbname}..."
     done
     # unmount boot partition
     EvalExAuto "sleep 1 && umount ${DevicePath}1" "\nUnmount boot partition..."
diff --git a/scripts/include/machine-raspberrypi.inc b/scripts/include/machine-raspberrypi.inc
index 36b255a..ea73033 100644
--- a/scripts/include/machine-raspberrypi.inc
+++ b/scripts/include/machine-raspberrypi.inc
@@ -35,15 +35,17 @@ RootCardKernelWriteCallback() {
     EvalExAuto "cp -f $DeployedFile $tmpdir/kernel7.img" "\nCopy new kernel kernel7.img..."
     # devicetrees
     EvalExAuto "rm -f $tmpdir/*.dtb" "\nRemove old devicetrees..."
+    echo
     for dtb in `find ${DeployFileDir} -name "bcm27*.dtb"`; do
-        EvalExAuto "cp -f $dtb $tmpdir/" "\nCopy $dtb -> $tmpdir..."
+        EvalExAuto "cp -f $dtb $tmpdir/" "Copy $dtb -> $tmpdir..."
     done
     # devicetree overlays
     EvalExAuto "rm -f $tmpdir/overlays/*.dtbo" "\nRemove old devicetree-overlays..."
+    echo
     for dtbo in `find ${DeployFileDir} -name "*.dtbo"`; do
         bname=`basename $dtbo`
         if ! echo "${bname}" | grep -q 'Image-'; then
-            EvalExAuto "cp -f ${dtbo} $tmpdir/overlays/" "\nCopy $dtbo -> $tmpdir/overlays/..."
+            EvalExAuto "cp -f ${dtbo} $tmpdir/overlays/" "Copy $dtbo -> $tmpdir/overlays/..."
         fi
     done
     # TODO bootfiles?