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: 11866 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5CF0123E42 for ; Fri, 28 Sep 2012 21:36:36 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 03A5AA1828E for ; Fri, 28 Sep 2012 21:36:35 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so8011632iej.11 for ; Fri, 28 Sep 2012 14:36:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=HzXY9CVYSzz0I+OMYjwPQMKePiui7WhTBmZ72CDHTmM=; b=GJmEp14KjYILLdb/OIuJT1bkOa+Tvpkx1lmMOMsRobCsTpIW9HEiet7pWiAl7mcteL BZH/DTVq2IfWyRUq1D/XGXyqNBh4sRbC09T+UAdg+bOncNy4pTmCpRb68X/tu6p6aHmu xrbUFAToKeZlW3kJbQ6iyuoASqfxAN08XUGKGjFrnEpJixDrtynAeWNgkJObkekW3/Ew IsUP8vokLqQFNSBaz5m7hafiyCAmxHiibw04oe6ryD5xsPB+ChpP8lqwoDf4MUshqbLl w9JwOZycATrrUemJvenpYRT9sJoP048Z1bfYvQc6hxSWoAxhNbs98W+Y9r4TIDjYW2IY eJdg== Received: by 10.50.217.229 with SMTP id pb5mr26311igc.28.1348868195693; Fri, 28 Sep 2012 14:36:35 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp495013igc; Fri, 28 Sep 2012 14:36:35 -0700 (PDT) Received: by 10.204.11.194 with SMTP id u2mr4305729bku.41.1348868194768; Fri, 28 Sep 2012 14:36:34 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.171]) by mx.google.com with ESMTPS id hi20si14161519bkc.140.2012.09.28.14.36.34 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 28 Sep 2012 14:36:34 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.171 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.171; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.171 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de 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 Cc: linux-kernel@vger.kernel.org, arm@kernel.org, Arnd Bergmann , Michal Marek , devicetree-discuss@lists.ozlabs.org, David Gibson 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-Gm-Message-State: ALoCoQmb+xFGOSCsyV6TAlMFTUCOfT4OxuG9b/3+vLglOBCk85Cv+4RvHC8bN6ZlnHljA804epvf 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");