| Message ID | 1348868177-21205-9-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 09/28/2012 03:36 PM, Arnd Bergmann wrote: > On a normal build, we get output from both make and from dtc > about each file that is being processed. > > DTC arch/arm/boot/vexpress-v2p-ca5s.dtb > DTC: dts->dtb on file "/git/arnd/linux-arm/arch/arm/boot/dts/vexpress-v2p-ca5s.dts" > DTC arch/arm/boot/vexpress-v2p-ca9.dtb > DTC: dts->dtb on file "/git/arnd/linux-arm/arch/arm/boot/dts/vexpress-v2p-ca9.dts" > DTC arch/arm/boot/vexpress-v2p-ca15-tc1.dtb > DTC: dts->dtb on file "/git/arnd/linux-arm/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts" > DTC arch/arm/boot/vexpress-v2p-ca15_a7.dtb > DTC: dts->dtb on file "/git/arnd/linux-arm/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts" > > When both lines refer to the same action. When building with "make -s", > the "DTC: dts->dtb ..." line is the only output we currently get. > > This patch makes dtc not output the message when the "-q" flag is passed, > and ensures that we pass it in both cases. Just as an FYI, the upstream dtc no longer prints this message, and I just posted a patch to pull that whole upstream dtc into the kernel.
On Friday 28 September 2012, Stephen Warren wrote: > On 09/28/2012 03:36 PM, Arnd Bergmann wrote: > > This patch makes dtc not output the message when the "-q" flag is passed, > > and ensures that we pass it in both cases. > > Just as an FYI, the upstream dtc no longer prints this message, and I > just posted a patch to pull that whole upstream dtc into the kernel. Ok, excellent! Michal, please ignore my patch then. Arnd
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 0be6f11..662528a 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -264,7 +264,7 @@ $(obj)/%.dtb.S: $(obj)/%.dtb $(call cmd,dt_S_dtb) quiet_cmd_dtc = DTC $@ -cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) -d $(depfile) $< +cmd_dtc = $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 $(DTC_FLAGS) -q -d $(depfile) $< # Bzip2 # --------------------------------------------------------------------------- diff --git a/scripts/dtc/dtc.c b/scripts/dtc/dtc.c index 2ef5e2e..a1586ff 100644 --- a/scripts/dtc/dtc.c +++ b/scripts/dtc/dtc.c @@ -188,8 +188,9 @@ int main(int argc, char *argv[]) if (minsize) fprintf(stderr, "DTC: Use of \"-S\" is deprecated; it will be removed soon, use \"-p\" instead\n"); - fprintf(stderr, "DTC: %s->%s on file \"%s\"\n", - inform, outform, arg); + if (!quiet) + fprintf(stderr, "DTC: %s->%s on file \"%s\"\n", + inform, outform, arg); if (depname) { depfile = fopen(depname, "w");
On a normal build, we get output from both make and from dtc about each file that is being processed. DTC arch/arm/boot/vexpress-v2p-ca5s.dtb DTC: dts->dtb on file "/git/arnd/linux-arm/arch/arm/boot/dts/vexpress-v2p-ca5s.dts" DTC arch/arm/boot/vexpress-v2p-ca9.dtb DTC: dts->dtb on file "/git/arnd/linux-arm/arch/arm/boot/dts/vexpress-v2p-ca9.dts" DTC arch/arm/boot/vexpress-v2p-ca15-tc1.dtb DTC: dts->dtb on file "/git/arnd/linux-arm/arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts" DTC arch/arm/boot/vexpress-v2p-ca15_a7.dtb DTC: dts->dtb on file "/git/arnd/linux-arm/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts" When both lines refer to the same action. When building with "make -s", the "DTC: dts->dtb ..." line is the only output we currently get. This patch makes dtc not output the message when the "-q" flag is passed, and ensures that we pass it in both cases. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Michal Marek <mmarek@suse.cz> Cc: devicetree-discuss@lists.ozlabs.org Cc: David Gibson <dwg@au1.ibm.com> --- scripts/Makefile.lib | 2 +- scripts/dtc/dtc.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)