From 371244cb19f9804711dd66e4281ff7979915fd2e Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 13 Sep 2016 21:44:07 -0600 Subject: Makefile: Give a build error if ad-hoc CONFIG options are added New CONFIG options should be added via Kconfig. To help prevent new ad-hoc CONFIGs from being added, give a build error when these are detected. Signed-off-by: Simon Glass Acked-by: Stephen Warren Tested-by: Stephen Warren --- Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1cf15cefd1..fffc188f9a 100644 --- a/Makefile +++ b/Makefile @@ -740,7 +740,8 @@ DO_STATIC_RELA = endif # Always append ALL so that arch config.mk's can add custom ones -ALL-y += u-boot.srec u-boot.bin u-boot.sym System.map u-boot.cfg binary_size_check +ALL-y += u-boot.srec u-boot.bin u-boot.sym System.map u-boot.cfg \ + binary_size_check no_new_adhoc_configs_check ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin ifeq ($(CONFIG_SPL_FSL_PBL),y) @@ -938,6 +939,13 @@ u-boot.dis: u-boot u-boot.cfg: include/config.h FORCE $(call if_changed,cpp_cfg) +# Check that this build does not use CONFIG options that we don't know about +# unless they are in Kconfig. All the existing CONFIG options are whitelisted, +# so new ones should not be added. +no_new_adhoc_configs_check: u-boot.cfg FORCE + $(srctree)/scripts/check-config.sh $< \ + $(srctree)/scripts/config_whitelist.txt ${srctree} 1>&2 + ifdef CONFIG_TPL SPL_PAYLOAD := tpl/u-boot-with-tpl.bin else -- cgit v1.2.3