The branch main has been updated by imp:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=25b1b63dba21e7d4fd511beffe6751b6402d44ac

commit 25b1b63dba21e7d4fd511beffe6751b6402d44ac
Author:     Warner Losh <i...@freebsd.org>
AuthorDate: 2022-10-28 21:42:58 +0000
Commit:     Warner Losh <i...@freebsd.org>
CommitDate: 2022-10-29 16:13:54 +0000

    dtb: Be much less verbose in the building of dtb
    
    Make the dtb/dtbo files with less noise. Remove echo statements, but add
    back the call for the non-meta builds to replace the removed noise.
    
    Suggetions by:          jrtc27
    Sponsored by:           Netflix
    Differential Revision:  https://reviews.freebsd.org/D37073
---
 sys/conf/dtb.build.mk      | 6 ++----
 sys/tools/fdt/make_dtb.sh  | 1 -
 sys/tools/fdt/make_dtbo.sh | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/sys/conf/dtb.build.mk b/sys/conf/dtb.build.mk
index 8d106615822f..83ee03943e16 100644
--- a/sys/conf/dtb.build.mk
+++ b/sys/conf/dtb.build.mk
@@ -38,12 +38,10 @@ DTBO=${DTSO:T:R:S/$/.dtbo/}
 .export DTC ECHO
 
 .dts.dtb:      ${OP_META}
-       @${ECHO} Generating ${.TARGET} from ${.IMPSRC}
-       @${SYSDIR}/tools/fdt/make_dtb.sh ${SYSDIR} ${.IMPSRC} ${.OBJDIR}
+       ${SYSDIR}/tools/fdt/make_dtb.sh ${SYSDIR} ${.IMPSRC} ${.OBJDIR}
 
 .dtso.dtbo:    ${OP_META}
-       @${ECHO} Generating ${.TARGET} from ${.IMPSRC}
-       @${SYSDIR}/tools/fdt/make_dtbo.sh ${SYSDIR} ${.IMPSRC} ${.OBJDIR}
+       ${SYSDIR}/tools/fdt/make_dtbo.sh ${SYSDIR} ${.IMPSRC} ${.OBJDIR}
 
 # Add dependencies on the source file so that out-of-tree things can be 
included
 # without any .PATH additions.
diff --git a/sys/tools/fdt/make_dtb.sh b/sys/tools/fdt/make_dtb.sh
index e1a2fa4b1d8a..728faa02b904 100755
--- a/sys/tools/fdt/make_dtb.sh
+++ b/sys/tools/fdt/make_dtb.sh
@@ -22,7 +22,6 @@ fi
 
 for d in ${dts}; do
     dtb="${dtb_path}/$(basename "$d" .dts).dtb"
-    ${ECHO} "converting $d -> $dtb"
     ${CPP} -P -x assembler-with-cpp -I "$S/dts/include" -I 
"$S/contrib/device-tree/include" -I "$S/dts/${MACHINE}" -I 
"$S/contrib/device-tree/src/${MACHINE}" -I "$S/contrib/device-tree/src/" 
-include "$d" -include "$S/dts/freebsd-compatible.dts" /dev/null |
        ${DTC} -@ -O dtb -o "$dtb" -b 0 -p 1024 -i "$S/dts/${MACHINE}" -i 
"$S/contrib/device-tree/src/${MACHINE}" -i "$S/contrib/device-tree/src/"
 done
diff --git a/sys/tools/fdt/make_dtbo.sh b/sys/tools/fdt/make_dtbo.sh
index 1fcab87a6465..46066019751f 100755
--- a/sys/tools/fdt/make_dtbo.sh
+++ b/sys/tools/fdt/make_dtbo.sh
@@ -22,7 +22,6 @@ fi
 
 for d in ${dtso}; do
     dtb="${dtbo_path}/$(basename "$d" .dtso).dtbo"
-    ${ECHO} "converting $d -> $dtb"
     ${CPP} -P -x assembler-with-cpp -I "$S/contrib/device-tree/include" -I 
"$S/dts/${MACHINE}" -I "$S/contrib/device-tree/src/${MACHINE}" -include "$d" 
/dev/null |
        ${DTC} -@ -O dtb -o "$dtb" -i "$S/dts/${MACHINE}" -i 
"$S/contrib/device-tree/src/${MACHINE}"
 done

Reply via email to