Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 12 Nov 2018 15:18:10 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r340362 - in stable/12/sys: conf tools/fdt
Message-ID:  <201811121518.wACFIA5d082719@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: kevans
Date: Mon Nov 12 15:18:09 2018
New Revision: 340362
URL: https://svnweb.freebsd.org/changeset/base/340362

Log:
  MFC r340297: Use ${ECHO} in dtb/dtbo build, pass in from dtb.mk for -s
  
  Approved by:	re (kib)

Modified:
  stable/12/sys/conf/dtb.mk
  stable/12/sys/tools/fdt/make_dtb.sh
  stable/12/sys/tools/fdt/make_dtbo.sh
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/conf/dtb.mk
==============================================================================
--- stable/12/sys/conf/dtb.mk	Mon Nov 12 13:26:13 2018	(r340361)
+++ stable/12/sys/conf/dtb.mk	Mon Nov 12 15:18:09 2018	(r340362)
@@ -58,8 +58,8 @@ all: ${DTB} ${DTBO}
 .export DTC
 .for _dts in ${DTS}
 ${_dts:R:S/$/.dtb/}:	${_dts} ${OP_META}
-	@echo Generating ${.TARGET} from ${_dts}
-	@${SYSDIR}/tools/fdt/make_dtb.sh ${SYSDIR} ${_dts} ${.OBJDIR}
+	@${ECHO} Generating ${.TARGET} from ${_dts}
+	@env ECHO=${ECHO} ${SYSDIR}/tools/fdt/make_dtb.sh ${SYSDIR} ${_dts} ${.OBJDIR}
 CLEANFILES+=${_dts:R:S/$/.dtb/}
 .endfor
 .endif
@@ -68,8 +68,8 @@ CLEANFILES+=${_dts:R:S/$/.dtb/}
 .export DTC
 .for _dtso in ${DTSO}
 ${_dtso:R:S/$/.dtbo/}:	${_dtso} ${OP_META}
-	@echo Generating ${.TARGET} from ${_dtso}
-	@${SYSDIR}/tools/fdt/make_dtbo.sh ${SYSDIR} overlays/${_dtso} ${.OBJDIR}
+	@${ECHO} Generating ${.TARGET} from ${_dtso}
+	@env ECHO=${ECHO} ${SYSDIR}/tools/fdt/make_dtbo.sh ${SYSDIR} overlays/${_dtso} ${.OBJDIR}
 CLEANFILES+=${_dtso:R:S/$/.dtbo/}
 .endfor
 .endif

Modified: stable/12/sys/tools/fdt/make_dtb.sh
==============================================================================
--- stable/12/sys/tools/fdt/make_dtb.sh	Mon Nov 12 13:26:13 2018	(r340361)
+++ stable/12/sys/tools/fdt/make_dtb.sh	Mon Nov 12 15:18:09 2018	(r340362)
@@ -17,10 +17,11 @@ if [ -z "${MACHINE}" ]; then
 fi
 
 : ${DTC:=dtc}
+: ${ECHO:=echo}
 
 for d in ${dts}; do
     dtb=${dtb_path}/`basename $d .dts`.dtb
-    echo "converting $d -> $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/
 done

Modified: stable/12/sys/tools/fdt/make_dtbo.sh
==============================================================================
--- stable/12/sys/tools/fdt/make_dtbo.sh	Mon Nov 12 13:26:13 2018	(r340361)
+++ stable/12/sys/tools/fdt/make_dtbo.sh	Mon Nov 12 15:18:09 2018	(r340362)
@@ -17,10 +17,11 @@ if [ -z "${MACHINE}" ]; then
 fi
 
 : ${DTC:=dtc}
+: ${ECHO:=echo}
 
 for d in ${dtso}; do
     dtb=${dtbo_path}/`basename $d .dtso`.dtbo
-    echo "converting $d -> $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} -include $d /dev/null | 
 	${DTC} -@ -O dtb -o $dtb -i $S/dts/${MACHINE} -i $S/gnu/dts/${MACHINE}
 done

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811121518.wACFIA5d082719>