configs: correct memory configuration

The shipped .config files all have CONFIG_FLATMEM_MANUAL and
CONFIG_SPARSEMEM_MANUAL set.

This is wrong because each .config should have just one of these two set
set. (There's also CONFIG_DISCONTIGMEM_MANUAL but Fedora doesn't use
that.) As a result the build generates
    [...]:warning: override: SPARSEMEM_MANUAL changes choice state

24 times.

If the configuration generation system drops CONFIG_FLATMEM_MANUAL the
warnings go away. And that doesn't change the final .config files that
the kernel's build system actually uses.

(Two details that very few people will care about:
1. x86/i686 still needs to unset CONFIG_FLATMEM_MANUAL to keep
process_configs.sh from killing the build;
2. the kernel build of armv7hl will silently drop
CONFIG_SPARSEMEM_MANUAL. Because of that I didn't bother with an
explicit override for arm/armv7.)

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>

13 files changed, 0 insertions, 13 deletions

diff --git a/configs/fedora/generic/CONFIG_FLATMEM_MANUAL b/configs/fedora/generic/CONFIG_FLATMEM_MANUAL
deleted file mode 100644
index c2bd90d57..000000000
--- a/configs/fedora/generic/CONFIG_FLATMEM_MANUAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FLATMEM_MANUAL=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 5e7fe2043..1c3b915a7 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1836,7 +1836,6 @@ CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=y
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
 CONFIG_FMC_FAKEDEV=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index d698088f3..409dd84d8 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1818,7 +1818,6 @@ CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=y
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
 CONFIG_FMC_FAKEDEV=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 909b73b57..b9e4ed73b 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1949,7 +1949,6 @@ CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=y
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
 CONFIG_FMC_FAKEDEV=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index b7304bfa0..edafd1aed 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1853,7 +1853,6 @@ CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=y
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
 CONFIG_FMC_FAKEDEV=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index d028be45d..0e6a91bd0 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1835,7 +1835,6 @@ CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=y
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
 CONFIG_FMC_FAKEDEV=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 9d6f08154..f987cc13a 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1931,7 +1931,6 @@ CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=y
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
 CONFIG_FMC_FAKEDEV=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index ffadfb838..6775f19f2 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1541,7 +1541,6 @@ CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=y
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
 CONFIG_FMC_FAKEDEV=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 212eb6ba6..218abc022 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1520,7 +1520,6 @@ CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=y
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
 CONFIG_FMC_FAKEDEV=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index b3a036e05..2fe538a7e 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1527,7 +1527,6 @@ CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=y
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
 CONFIG_FMC_FAKEDEV=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index fb71c3cea..9dc2fc421 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1506,7 +1506,6 @@ CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=y
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
 CONFIG_FMC_FAKEDEV=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index a4a6e1457..e0aaa2740 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1723,7 +1723,6 @@ CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=y
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
 CONFIG_FMC_FAKEDEV=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 147f27dd0..b2e2fb01c 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1702,7 +1702,6 @@ CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_FIXED_PHY=y
-CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
 CONFIG_FMC_FAKEDEV=m