moveconfig: Ignore duplicate configs when moving

[karo-tx-uboot.git] / scripts / Makefile.autoconf

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 > $@;                                                              \