Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

kbuild: beautify the log of config whitelist check

Browse source 
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>
This commit is contained in:
Masahiro Yamada 2017-01-31 20:11:33 +09:00 committed by Tom Rini
parent f0a3f3492a
commit 1bdd942b6d
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile
View file

@ -836,6 +836,10 @@ cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@
cfg: u-boot.cfg 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) all: $(ALL-y)
ifeq ($(CONFIG_DM_I2C_COMPAT)$(CONFIG_SANDBOX),y) ifeq ($(CONFIG_DM_I2C_COMPAT)$(CONFIG_SANDBOX),y)
@echo "===================== WARNING ======================" @echo "===================== WARNING ======================"
@ -847,8 +851,7 @@ endif
@# Check that this build does not use CONFIG options that we do not @# Check that this build does not use CONFIG options that we do not
@# know about unless they are in Kconfig. All the existing CONFIG @# know about unless they are in Kconfig. All the existing CONFIG
@# options are whitelisted, so new ones should not be added. @# options are whitelisted, so new ones should not be added.
$(srctree)/scripts/check-config.sh u-boot.cfg \ $(call cmd,cfgcheck,u-boot.cfg)
$(srctree)/scripts/config_whitelist.txt ${srctree} 1>&2
PHONY += dtbs PHONY += dtbs
dtbs: dts/dt.dtb dtbs: dts/dt.dtb

12
scripts/check-config.sh
View file

@ -37,12 +37,12 @@ cat `find ${srctree} -name "Kconfig*"` |sed -n \
-e 's/^menuconfig \([A-Za-z0-9_]*\).*$/CONFIG_\1/p' |sort |uniq > ${ok} -e 's/^menuconfig \([A-Za-z0-9_]*\).*$/CONFIG_\1/p' |sort |uniq > ${ok}
comm -23 ${suspects} ${ok} >${new_adhoc} comm -23 ${suspects} ${ok} >${new_adhoc}
if [ -s ${new_adhoc} ]; then if [ -s ${new_adhoc} ]; then
echo "Error: You must add new CONFIG options using Kconfig" echo >&2 "Error: You must add new CONFIG options using Kconfig"
echo "The following new ad-hoc CONFIG options were detected:" echo >&2 "The following new ad-hoc CONFIG options were detected:"
cat ${new_adhoc} cat >&2 ${new_adhoc}
echo echo >&2
echo "Please add these via Kconfig instead. Find a suitable Kconfig" echo >&2 "Please add these via Kconfig instead. Find a suitable Kconfig"
echo "file and add a 'config' or 'menuconfig' option." echo >&2 "file and add a 'config' or 'menuconfig' option."
# Don't delete the temporary files in case they are useful # Don't delete the temporary files in case they are useful
exit 1 exit 1
else else