summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-09-26 13:04:59 +0900
committerTom Rini <trini@konsulko.com>2016-10-07 14:26:32 +0000
commit4bf06d11c3ba2041f2cc2dd39abe41ff08c3831d (patch)
treec06893255fcaf744b7675e962efbc1419d4303b6 /Makefile
parent7b76daab477264644b8c2dad78ccc9602c250251 (diff)
kbuild: move no_new_adhoc_configs_check to "all" target command
I am going to move the build rule of u-boot.cfg. Before that, no_new_adhoc_configs_check must be tweaked to not depend on it. The ad-hoc option check can be done at the end of build, along with other checks. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 6 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index c67cc99633..7a731d2759 100644
--- a/Makefile
+++ b/Makefile
@@ -742,7 +742,7 @@ 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 no_new_adhoc_configs_check
+ binary_size_check
ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin
ifeq ($(CONFIG_SPL_FSL_PBL),y)
@@ -821,6 +821,11 @@ ifeq ($(CONFIG_DM_I2C_COMPAT)$(CONFIG_SANDBOX),y)
@echo "before sending patches to the mailing list."
@echo "===================================================="
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
PHONY += dtbs
dtbs: dts/dt.dtb
@@ -951,13 +956,6 @@ endif
u-boot.cfg: include/config.h FORCE
$(call if_changed_dep,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