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 moveconfig.py 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/moveconfig.py now defines KCONFIG_IGNORE_DUPLICATES to prevent the
filtering from happening and selecting wrong values for the defconfig.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf
index f054081c98959ccbfd0cbd3acbd660fd2b40637c..36bfa17b47e66a15a26f08dfd8e3997a89cba53a 100644 (file)
--- 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 24fc281b09329895296e0d92ac324c5fba4b374b..87ced5cd8959a3c3eceb3a5983c102ac94e98c65 100755 (executable)
--- 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