Author: kevans Date: Fri Nov 9 18:56:40 2018 New Revision: 340297 URL: https://svnweb.freebsd.org/changeset/base/340297
Log: Use ${ECHO} in dtb/dtbo build, pass in from dtb.mk for -s Reported by: sbruno MFC after: 3 days Modified: head/sys/conf/dtb.mk head/sys/tools/fdt/make_dtb.sh head/sys/tools/fdt/make_dtbo.sh Modified: head/sys/conf/dtb.mk ============================================================================== --- head/sys/conf/dtb.mk Fri Nov 9 18:35:09 2018 (r340296) +++ head/sys/conf/dtb.mk Fri Nov 9 18:56:40 2018 (r340297) @@ -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: head/sys/tools/fdt/make_dtb.sh ============================================================================== --- head/sys/tools/fdt/make_dtb.sh Fri Nov 9 18:35:09 2018 (r340296) +++ head/sys/tools/fdt/make_dtb.sh Fri Nov 9 18:56:40 2018 (r340297) @@ -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: head/sys/tools/fdt/make_dtbo.sh ============================================================================== --- head/sys/tools/fdt/make_dtbo.sh Fri Nov 9 18:35:09 2018 (r340296) +++ head/sys/tools/fdt/make_dtbo.sh Fri Nov 9 18:56:40 2018 (r340297) @@ -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 _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"