kbuild: beautify the log of config whitelist check
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 31 Jan 2017 11:11:33 +0000 (20:11 +0900)
committerTom Rini <trini@konsulko.com>
Wed, 8 Feb 2017 20:56:30 +0000 (15:56 -0500)
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 <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Makefile
scripts/check-config.sh

index c54fc06..0b1e8a6 100644 (file)
--- 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
index 6618dfb..97e52dc 100755 (executable)
@@ -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