path: root/scripts/Makefile.autoconf
diff options
authorJoe Hershberger <>2015-05-19 13:21:18 -0500
committerMasahiro Yamada <>2015-05-27 08:39:15 +0900
commit7740f653e6b3634383603e31ad2f3decac8becf1 (patch)
tree40f9214554eeb50c93ecb2d0a30ea058018ec92b /scripts/Makefile.autoconf
parent96464badc794556d28ce34624d24da944b5716db (diff)
moveconfig: Ignore duplicate configs when moving
When moving configs, it is important to know what was defined in the config header even if it duplicates the configs coming from Kconfig. This is specifically needed for the case where a config is set to default 'y' in the Kconfig. This would previously cause the actual value from the include config to be filtered out, and would think that it was 'n'... This means that the value that should be 'y' is now (in every defconfig) set to 'not set'. tools/ now defines KCONFIG_IGNORE_DUPLICATES to prevent the filtering from happening and selecting wrong values for the defconfig. Signed-off-by: Joe Hershberger <> Acked-by: Masahiro Yamada <>
Diffstat (limited to 'scripts/Makefile.autoconf')
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index f054081c98..36bfa17b47 100644
--- a/scripts/Makefile.autoconf
+++ b/scripts/Makefile.autoconf
@@ -58,7 +58,8 @@ quiet_cmd_autoconf = GEN $@
$(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > $@.tmp && { \
sed -n -f $(srctree)/tools/scripts/define2mk.sed $@.tmp | \
while read line; do \
- if ! grep -q "$${line%=*}=" include/config/auto.conf; then \
+ if [ -n "${KCONFIG_IGNORE_DUPLICATES}" ] || \
+ ! grep -q "$${line%=*}=" include/config/auto.conf; then \
echo "$$line"; \
fi \
done > $@; \
OpenPOWER on IntegriCloud