Index: head/sys/tools/fdt/make_dtb.sh
===================================================================
--- head/sys/tools/fdt/make_dtb.sh	(revision 342104)
+++ head/sys/tools/fdt/make_dtb.sh	(revision 342105)
@@ -1,27 +1,28 @@
 #!/bin/sh
 #
 # $FreeBSD$
 
 # Script generates dtb file ($3) from dts source ($2) in build tree S ($1)
 S=$1
 dts="$2"
 dtb_path=$3
 
 if [ -z "$dts" ]; then
     echo "No DTS specified"
     exit 1
 fi
 
 if [ -z "${MACHINE}" ]; then
     MACHINE=$(uname -m)
 fi
 
-: ${DTC:=dtc}
-: ${ECHO:=echo}
+: "${DTC:=dtc}"
+: "${ECHO:=echo}"
+: "${CPP:=cpp}"
 
 for d in ${dts}; do
-    dtb=${dtb_path}/`basename $d .dts`.dtb
+    dtb="${dtb_path}/$(basename "$d" .dts).dtb"
     ${ECHO} "converting $d -> $dtb"
-    cpp -P -x assembler-with-cpp -I $S/gnu/dts/include -I $S/dts/${MACHINE} -I $S/gnu/dts/${MACHINE} -I $S/gnu/dts/ -include $d /dev/null | 
-	${DTC} -@ -O dtb -o $dtb -b 0 -p 1024 -i $S/dts/${MACHINE} -i $S/gnu/dts/${MACHINE} -i $S/gnu/dts/
+    ${CPP} -P -x assembler-with-cpp -I "$S/gnu/dts/include" -I "$S/dts/${MACHINE}" -I "$S/gnu/dts/${MACHINE}" -I "$S/gnu/dts/" -include "$d" /dev/null |
+	${DTC} -@ -O dtb -o "$dtb" -b 0 -p 1024 -i "$S/dts/${MACHINE}" -i "$S/gnu/dts/${MACHINE}" -i "$S/gnu/dts/"
 done
Index: head/sys/tools/fdt/make_dtbo.sh
===================================================================
--- head/sys/tools/fdt/make_dtbo.sh	(revision 342104)
+++ head/sys/tools/fdt/make_dtbo.sh	(revision 342105)
@@ -1,27 +1,28 @@
 #!/bin/sh
 #
 # $FreeBSD$
 
 # Script generates dtbo file ($3) from dtso source ($2) in build tree S ($1)
 S=$1
 dtso="$2"
 dtbo_path=$3
 
 if [ -z "$dtso" ]; then
     echo "No DTS overlays specified"
     exit 1
 fi
 
 if [ -z "${MACHINE}" ]; then
     MACHINE=$(uname -m)
 fi
 
-: ${DTC:=dtc}
-: ${ECHO:=echo}
+: "${DTC:=dtc}"
+: "${ECHO:=echo}"
+: "${CPP:=cpp}"
 
 for d in ${dtso}; do
-    dtb=${dtbo_path}/`basename $d .dtso`.dtbo
+    dtb="${dtbo_path}/$(basename "$d" .dtso).dtbo"
     ${ECHO} "converting $d -> $dtb"
-    cpp -P -x assembler-with-cpp -I $S/gnu/dts/include -I $S/dts/${MACHINE} -I $S/gnu/dts/${MACHINE} -include $d /dev/null | 
-	${DTC} -@ -O dtb -o $dtb -i $S/dts/${MACHINE} -i $S/gnu/dts/${MACHINE}
+    ${CPP} -P -x assembler-with-cpp -I "$S/gnu/dts/include" -I "$S/dts/${MACHINE}" -I "$S/gnu/dts/${MACHINE}" -include "$d" /dev/null |
+	${DTC} -@ -O dtb -o "$dtb" -i "$S/dts/${MACHINE}" -i "$S/gnu/dts/${MACHINE}"
 done