Commit 1572497c authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Masahiro Yamada
Browse files

kconfig: include common Kconfig files from top-level Kconfig 



Instead of duplicating the source statements in every architecture just
do it once in the toplevel Kconfig file.

Note that with this the inclusion of arch/$(SRCARCH/Kconfig moves out of
the top-level Kconfig into arch/Kconfig so that don't violate ordering
constraits while keeping a sensible menu structure.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 17c46a6a

Kconfig

+21 −1
Original line number Diff line number Diff line
@@ -9,4 +9,24 @@ comment "Compiler: $(CC_VERSION_TEXT)" 


source "scripts/Kconfig.include"



source "arch/$(SRCARCH)/Kconfig"
 
source "init/Kconfig"



source "kernel/Kconfig.freezer"



menu "Executable file formats"

source "fs/Kconfig.binfmt"

endmenu



source "mm/Kconfig"



source "net/Kconfig"



source "drivers/Kconfig"



source "fs/Kconfig"



source "security/Kconfig"



source "crypto/Kconfig"



source "lib/Kconfig"

arch/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -3,6 +3,12 @@ 
# General architecture dependent options

#



#

# Note: arch/$(SRCARCH)/Kconfig needs to be included first so that it can

# override the default values in this file.

#

source "arch/$(SRCARCH)/Kconfig"



config CRASH_CORE

	bool

arch/alpha/Kconfig

+0 −20
Original line number Diff line number Diff line
@@ -74,9 +74,6 @@ config PGTABLE_LEVELS 
	int

	default 3



source "init/Kconfig"

source "kernel/Kconfig.freezer"



config AUDIT_ARCH

	bool
@@ -573,8 +570,6 @@ config ARCH_DISCONTIGMEM_ENABLE 
	  or have huge holes in the physical address space for other reasons.

	  See <file:Documentation/vm/numa.rst> for more.



source "mm/Kconfig"



config NUMA

	bool "NUMA Support (EXPERIMENTAL)"

	depends on DISCONTIGMEM && BROKEN
@@ -713,16 +708,8 @@ config SRM_ENV 
	  This driver is also available as a module and will be called

	  srm_env then.



source "fs/Kconfig.binfmt"



endmenu



source "net/Kconfig"



source "drivers/Kconfig"



source "fs/Kconfig"



source "arch/alpha/Kconfig.debug"



# DUMMY_CONSOLE may be defined in drivers/video/console/Kconfig
@@ -731,10 +718,3 @@ config DUMMY_CONSOLE 
	bool

	depends on VGA_HOSE

	default y
 


source "security/Kconfig"



source "crypto/Kconfig"



source "lib/Kconfig"

arch/arc/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -94,9 +94,6 @@ config HAVE_ARCH_TRANSPARENT_HUGEPAGE 
	def_bool y

	depends on ARC_MMU_V4



source "init/Kconfig"

source "kernel/Kconfig.freezer"



menu "ARC Architecture Configuration"



menu "ARC Platform/SoC/Board"
@@ -550,22 +547,13 @@ config ARC_BUILTIN_DTB_NAME 


source "kernel/Kconfig.preempt"



menu "Executable file formats"

source "fs/Kconfig.binfmt"

endmenu



endmenu	 # "ARC Architecture Configuration"



source "mm/Kconfig"



config FORCE_MAX_ZONEORDER

	int "Maximum zone order"

	default "12" if ARC_HUGEPAGE_16M

	default "11"



source "net/Kconfig"

source "drivers/Kconfig"



menu "Bus Support"



config PCI
@@ -586,9 +574,5 @@ source "drivers/pci/Kconfig" 


endmenu



source "fs/Kconfig"

source "arch/arc/Kconfig.debug"

source "security/Kconfig"

source "crypto/Kconfig"

source "lib/Kconfig"

source "kernel/power/Kconfig"

arch/arm/Kconfig

+0 −23
Original line number Diff line number Diff line
@@ -298,10 +298,6 @@ config PGTABLE_LEVELS 
	default 3 if ARM_LPAE

	default 2



source "init/Kconfig"



source "kernel/Kconfig.freezer"



menu "System Type"



config MMU
@@ -1721,8 +1717,6 @@ config ARM_MODULE_PLTS 
	  Disabling this is usually safe for small single-platform

	  configurations. If unsure, say y.



source "mm/Kconfig"



config FORCE_MAX_ZONEORDER

	int "Maximum zone order"

	default "12" if SOC_AM33XX
@@ -2175,12 +2169,6 @@ config KERNEL_MODE_NEON 


endmenu



menu "Userspace binary formats"



source "fs/Kconfig.binfmt"



endmenu



menu "Power management options"



source "kernel/power/Kconfig"
@@ -2201,23 +2189,12 @@ config ARCH_HIBERNATION_POSSIBLE 


endmenu



source "net/Kconfig"



source "drivers/Kconfig"



source "drivers/firmware/Kconfig"



source "fs/Kconfig"



source "arch/arm/Kconfig.debug"



source "security/Kconfig"



source "crypto/Kconfig"

if CRYPTO

source "arch/arm/crypto/Kconfig"

endif



source "lib/Kconfig"



source "arch/arm/kvm/Kconfig"