summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--scripts/Makefile.autoconf3
-rwxr-xr-xtools/moveconfig.py1
2 files changed, 3 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 > $@; \
diff --git a/tools/moveconfig.py b/tools/moveconfig.py
index 24fc281b09..87ced5cd89 100755
--- a/tools/moveconfig.py
+++ b/tools/moveconfig.py
@@ -628,6 +628,7 @@ class Slot:
cmd = list(self.make_cmd)
if cross_compile:
cmd.append('CROSS_COMPILE=%s' % cross_compile)
+ cmd.append('KCONFIG_IGNORE_DUPLICATES=1')
cmd.append('include/config/auto.conf')
self.ps = subprocess.Popen(cmd, stdout=self.devnull)
self.state = STATE_AUTOCONF
OpenPOWER on IntegriCloud