From patchwork Tue Jan 31 11:11:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 92958 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1872255qgi; Tue, 31 Jan 2017 03:12:38 -0800 (PST) X-Received: by 10.28.32.198 with SMTP id g189mr17035110wmg.37.1485861158779; Tue, 31 Jan 2017 03:12:38 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id e44si20365923wre.209.2017.01.31.03.12.38; Tue, 31 Jan 2017 03:12:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B329C4B55F; Tue, 31 Jan 2017 12:12:36 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mIGfjZOnw07H; Tue, 31 Jan 2017 12:12:36 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 09CD84B1FE; Tue, 31 Jan 2017 12:12:36 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0637E4B1FE for ; Tue, 31 Jan 2017 12:12:32 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0IwUlqbThozN for ; Tue, 31 Jan 2017 12:12:31 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from conuserg-12.nifty.com (conuserg-12.nifty.com [210.131.2.79]) by theia.denx.de (Postfix) with ESMTPS id 544A94B105 for ; Tue, 31 Jan 2017 12:12:27 +0100 (CET) Received: from pug.jp.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-12.nifty.com with ESMTP id v0VBBcBH009927; Tue, 31 Jan 2017 20:11:39 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-12.nifty.com v0VBBcBH009927 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1485861099; bh=kS86MQhTrgJiOzWwzEHauv0e9uGVyOlQ6j1ajOgiMss=; h=From:To:Cc:Subject:Date:From; b=O2noEE4flgu0dP++BcNY15OQtXzAd+JtH1BfnPPpMqBDmpvzK8uddgNQ5JwW0xS8u T4i5PXgyHPQSMtSoVJpeZeeMaWc/74YsKFKAc9qpDR7pueG+ZIz6jKSdWvSo0eX98r oF3m9+Wnw9KwK0Rg30UnqNwroRzQV9UwnFldRljfbSdC5n2Wa4Kv7kJGrahb/saOOC LvFbLc4+AwuTRqFla9LnOzJaNjtyGSGp6jemQT8j2V1MAy4w+i2Z6FA89AW3PPMAvg N+2++xLPOWzQwvHpRGLrdimFYQaIokUNjG+8G3x8luYPPRodRv2Zt1f5IsE0fvs6I/ O34Js3cAyUf0Q== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 31 Jan 2017 20:11:33 +0900 Message-Id: <1485861093-27504-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Cc: Stephen Warren Subject: [U-Boot] [PATCH] kbuild: beautify the log of config whitelist check X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Use the kbuild style log. Prior to this commit: ./scripts/check-config.sh u-boot.cfg \ ./scripts/config_whitelist.txt . 1>&2 With this commit: CFGCHK u-boot.cfg Signed-off-by: Masahiro Yamada --- Makefile | 7 +++++-- scripts/check-config.sh | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) -- 2.7.4 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot Reviewed-by: Simon Glass diff --git a/Makefile b/Makefile index 4e7f7cf..c4fc6d2 100644 --- a/Makefile +++ b/Makefile @@ -836,6 +836,10 @@ cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@ cfg: u-boot.cfg +quiet_cmd_cfgcheck = CFGCHK $2 +cmd_cfgcheck = $(srctree)/scripts/check-config.sh $2 \ + $(srctree)/scripts/config_whitelist.txt $(srctree) + all: $(ALL-y) ifeq ($(CONFIG_DM_I2C_COMPAT)$(CONFIG_SANDBOX),y) @echo "===================== WARNING ======================" @@ -847,8 +851,7 @@ endif @# Check that this build does not use CONFIG options that we do not @# know about unless they are in Kconfig. All the existing CONFIG @# options are whitelisted, so new ones should not be added. - $(srctree)/scripts/check-config.sh u-boot.cfg \ - $(srctree)/scripts/config_whitelist.txt ${srctree} 1>&2 + $(call cmd,cfgcheck,u-boot.cfg) PHONY += dtbs dtbs: dts/dt.dtb diff --git a/scripts/check-config.sh b/scripts/check-config.sh index 6618dfb..97e52dc 100755 --- a/scripts/check-config.sh +++ b/scripts/check-config.sh @@ -37,12 +37,12 @@ cat `find ${srctree} -name "Kconfig*"` |sed -n \ -e 's/^menuconfig \([A-Za-z0-9_]*\).*$/CONFIG_\1/p' |sort |uniq > ${ok} comm -23 ${suspects} ${ok} >${new_adhoc} if [ -s ${new_adhoc} ]; then - echo "Error: You must add new CONFIG options using Kconfig" - echo "The following new ad-hoc CONFIG options were detected:" - cat ${new_adhoc} - echo - echo "Please add these via Kconfig instead. Find a suitable Kconfig" - echo "file and add a 'config' or 'menuconfig' option." + echo >&2 "Error: You must add new CONFIG options using Kconfig" + echo >&2 "The following new ad-hoc CONFIG options were detected:" + cat >&2 ${new_adhoc} + echo >&2 + echo >&2 "Please add these via Kconfig instead. Find a suitable Kconfig" + echo >&2 "file and add a 'config' or 'menuconfig' option." # Don't delete the temporary files in case they are useful exit 1 else