From patchwork Fri Sep 28 21:36:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1526571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 00B953FE80 for ; Fri, 28 Sep 2012 21:42:51 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1THiIi-000415-7h; Fri, 28 Sep 2012 21:40:49 +0000 Received: from moutng.kundenserver.de ([212.227.126.171]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1THiEg-0001nQ-HI for linux-arm-kernel@lists.infradead.org; Fri, 28 Sep 2012 21:36:41 +0000 Received: from localhost.localdomain (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0MXWgY-1Su9jv3VbS-00W64z; Fri, 28 Sep 2012 23:36:22 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/12] dtc: be more quiet with "make -s" Date: Fri, 28 Sep 2012 23:36:13 +0200 Message-Id: <1348868177-21205-9-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1348868177-21205-1-git-send-email-arnd@arndb.de> References: <1348868177-21205-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:5QIQR6oUYvVRnVEOiM1bzvd/vBB+eh4X7tY4e++qjVr N8LvdaG3XGoyYSpz8HneV8l8ms15zZ+8aKz1vhmXuCK3GH71dJ S51FGMeSn9+pjs/Pc50IaD+u+6g5y3RFNsV/ybo+UrKeQh3T9U 750cyqj+JykyKdFucMaf3o4ehYhWGrZiyzrXQh5VqEKgeCRO1B JIc6BxuyMergFA+QPomDpYZO3Yh9pcME4mjUQ2tviEK4ZKRVkm ORH+XupaJ3MQpxiEZ6z4fUTR1+ZCiq1v8Alb3/6GA8KiePDkLb v8JiUllGhryg57GBG/3lOjzHY/kO0UAzunbRjEFcrTkn9uS+f2 pg8csYoJZjm2k6gtU/1hTk8Uh3AC+MLXz/z1RyWvdAhFL3kovv FUV4gXOdf+OoQ== X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.171 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Michal Marek , Arnd Bergmann , devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, David Gibson , arm@kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 Cc: Michal Marek Cc: devicetree-discuss@lists.ozlabs.org Cc: David Gibson --- scripts/Makefile.lib | 2 +- scripts/dtc/dtc.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) 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");