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
    [...]⚠️ 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>
This commit is contained in:
Paul Bolle 2018-11-13 17:57:20 +01:00 committed by Justin M. Forbes
parent ae8e3e89c1
commit 23a14040db
13 changed files with 0 additions and 13 deletions

View File

@ -1 +0,0 @@
CONFIG_FLATMEM_MANUAL=y

View File

@ -1782,7 +1782,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_FIRMWARE_EDID is not set # CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FM10K=m CONFIG_FM10K=m
CONFIG_FMC_CHARDEV=m CONFIG_FMC_CHARDEV=m
CONFIG_FMC_FAKEDEV=m CONFIG_FMC_FAKEDEV=m

View File

@ -1765,7 +1765,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_FIRMWARE_EDID is not set # CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FM10K=m CONFIG_FM10K=m
CONFIG_FMC_CHARDEV=m CONFIG_FMC_CHARDEV=m
CONFIG_FMC_FAKEDEV=m CONFIG_FMC_FAKEDEV=m

View File

@ -1886,7 +1886,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_FIRMWARE_EDID is not set # CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FM10K=m CONFIG_FM10K=m
CONFIG_FMC_CHARDEV=m CONFIG_FMC_CHARDEV=m
CONFIG_FMC_FAKEDEV=m CONFIG_FMC_FAKEDEV=m

View File

@ -1794,7 +1794,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_FIRMWARE_EDID is not set # CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FM10K=m CONFIG_FM10K=m
CONFIG_FMC_CHARDEV=m CONFIG_FMC_CHARDEV=m
CONFIG_FMC_FAKEDEV=m CONFIG_FMC_FAKEDEV=m

View File

@ -1778,7 +1778,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_FIRMWARE_EDID is not set # CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FM10K=m CONFIG_FM10K=m
CONFIG_FMC_CHARDEV=m CONFIG_FMC_CHARDEV=m
CONFIG_FMC_FAKEDEV=m CONFIG_FMC_FAKEDEV=m

View File

@ -1870,7 +1870,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_FIRMWARE_EDID is not set # CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FM10K=m CONFIG_FM10K=m
CONFIG_FMC_CHARDEV=m CONFIG_FMC_CHARDEV=m
CONFIG_FMC_FAKEDEV=m CONFIG_FMC_FAKEDEV=m

View File

@ -1486,7 +1486,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_FIRMWARE_EDID is not set # CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FM10K=m CONFIG_FM10K=m
CONFIG_FMC_CHARDEV=m CONFIG_FMC_CHARDEV=m
CONFIG_FMC_FAKEDEV=m CONFIG_FMC_FAKEDEV=m

View File

@ -1468,7 +1468,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_FIRMWARE_EDID is not set # CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FM10K=m CONFIG_FM10K=m
CONFIG_FMC_CHARDEV=m CONFIG_FMC_CHARDEV=m
CONFIG_FMC_FAKEDEV=m CONFIG_FMC_FAKEDEV=m

View File

@ -1471,7 +1471,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_FIRMWARE_EDID is not set # CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FM10K=m CONFIG_FM10K=m
CONFIG_FMC_CHARDEV=m CONFIG_FMC_CHARDEV=m
CONFIG_FMC_FAKEDEV=m CONFIG_FMC_FAKEDEV=m

View File

@ -1453,7 +1453,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_FIRMWARE_EDID is not set # CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FM10K=m CONFIG_FM10K=m
CONFIG_FMC_CHARDEV=m CONFIG_FMC_CHARDEV=m
CONFIG_FMC_FAKEDEV=m CONFIG_FMC_FAKEDEV=m

View File

@ -1664,7 +1664,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_FIRMWARE_EDID is not set # CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FM10K=m CONFIG_FM10K=m
CONFIG_FMC_CHARDEV=m CONFIG_FMC_CHARDEV=m
CONFIG_FMC_FAKEDEV=m CONFIG_FMC_FAKEDEV=m

View File

@ -1646,7 +1646,6 @@ CONFIG_FIREWIRE_SBP2=m
# CONFIG_FIREWIRE_SERIAL is not set # CONFIG_FIREWIRE_SERIAL is not set
# CONFIG_FIRMWARE_EDID is not set # CONFIG_FIRMWARE_EDID is not set
CONFIG_FIXED_PHY=y CONFIG_FIXED_PHY=y
CONFIG_FLATMEM_MANUAL=y
CONFIG_FM10K=m CONFIG_FM10K=m
CONFIG_FMC_CHARDEV=m CONFIG_FMC_CHARDEV=m
CONFIG_FMC_FAKEDEV=m CONFIG_FMC_FAKEDEV=m