kbuild: migrate all arch to the kconfig mainmenu upgrade

Signed-off-by: Arnaud Lacombe <lacombar@gmail.com> Reviewed-by: Sam Ravnborg <sam@ravnborg.org> Reviewed-by: Michal Marek <mmarek@suse.cz>
12 years ago · 838a2e55e6
25 changed files with 12 additions and 137 deletions
--- a/11
+++ b/11
@ -0,0 +1,11 @@
				@@ -0,0 +1,11 @@
+#
+# For a description of the syntax of this configuration file,
+# see Documentation/kbuild/kconfig-language.txt.
+#
+mainmenu "Linux/$ARCH $KERNELVERSION Kernel Configuration"
+
+config SRCARCH
+	string
+	option env="SRCARCH"
+
+source "arch/$SRCARCH/Kconfig"
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@ -1,7 +1,3 @@
				@@ -1,7 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
 config ALPHA
 	bool
 	default y
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@ -1,10 +1,3 @@
				@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Linux Kernel Configuration"
-
 config ARM
 	bool
 	default y
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@ -1,10 +1,3 @@
				@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Linux Kernel Configuration"
-
 config AVR32
 	def_bool y
 	# With EMBEDDED=n, we get lots of stuff automatically selected
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@ -1,10 +1,3 @@
				@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Blackfin Kernel Configuration"
-
 config SYMBOL_PREFIX
 	string
 	default "_"
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@ -1,10 +1,3 @@
				@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see the Configure script.
-#
-
-mainmenu "Linux/CRIS Kernel Configuration"
-
 config MMU
 	bool
 	default y
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@ -1,7 +1,3 @@
				@@ -1,7 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
 config FRV
 	bool
 	default y
@ -64,8 +60,6 @@ config HZ
				@@ -64,8 +60,6 @@ config HZ
 	int
 	default 1000

-mainmenu "Fujitsu FR-V Kernel Configuration"
-
 source "init/Kconfig"

 source "kernel/Kconfig.freezer"
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@ -1,10 +1,3 @@
				@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "uClinux/h8300 (w/o MMU) Kernel Configuration"
-
 config H8300
 	bool
 	default y
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@ -1,10 +1,3 @@
				@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "IA-64 Linux Kernel Configuration"
-
 source "init/Kconfig"

 source "kernel/Kconfig.freezer"
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@ -1,10 +1,3 @@
				@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Linux/M32R Kernel Configuration"
-
 config M32R
 	bool
 	default y
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@ -1,7 +1,3 @@
				@@ -1,7 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
 config M68K
 	bool
 	default y
@ -65,8 +61,6 @@ config GENERIC_TIME
				@@ -65,8 +61,6 @@ config GENERIC_TIME
 config ARCH_USES_GETTIMEOFFSET
 	def_bool y

-mainmenu "Linux/68k Kernel Configuration"
-
 source "init/Kconfig"

 source "kernel/Kconfig.freezer"
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@ -1,10 +1,3 @@
				@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "uClinux/68k (w/o MMU) Kernel Configuration"
-
 config M68K
 	bool
 	default y
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@ -1,8 +1,3 @@
				@@ -1,8 +1,3 @@
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-
-mainmenu "Linux/Microblaze Kernel Configuration"
-
 config MICROBLAZE
 	def_bool y
 	select HAVE_MEMBLOCK
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@ -12,8 +12,6 @@ config MIPS
				@@ -12,8 +12,6 @@ config MIPS
 	select HAVE_FUNCTION_GRAPH_TRACER
 	select RTC_LIB if !MACH_LOONGSON

-mainmenu "Linux/MIPS Kernel Configuration"
-
 menu "Machine selection"

 config ZONE_DMA
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@ -1,10 +1,3 @@
				@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Linux Kernel Configuration"
-
 config MN10300
 	def_bool y
 	select HAVE_OPROFILE
@ -69,8 +62,6 @@ config HZ
				@@ -69,8 +62,6 @@ config HZ
 	int
 	default 1000

-mainmenu "Matsushita MN10300/AM33 Kernel Configuration"
-
 source "init/Kconfig"

 source "kernel/Kconfig.freezer"
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@ -1,10 +1,3 @@
				@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Linux/PA-RISC Kernel Configuration"
-
 config PARISC
 	def_bool y
 	select HAVE_IDE
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@ -1,9 +1,3 @@
				@@ -1,9 +1,3 @@
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Linux/PowerPC Kernel Configuration"
-
 source "arch/powerpc/platforms/Kconfig.cputype"

 config PPC32
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@ -1,8 +1,3 @@
				@@ -1,8 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
 config SCHED_MC
 	def_bool y
 	depends on SMP
@ -78,8 +73,6 @@ config VIRT_CPU_ACCOUNTING
				@@ -78,8 +73,6 @@ config VIRT_CPU_ACCOUNTING
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
 	def_bool y

-mainmenu "Linux Kernel Configuration"
-
 config S390
 	def_bool y
 	select USE_GENERIC_SMP_HELPERS if SMP
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@ -1,8 +1,3 @@
				@@ -1,8 +1,3 @@
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-
-mainmenu "Linux/SCORE Kernel Configuration"
-
 menu "Machine selection"

 choice
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@ -1,10 +1,3 @@
				@@ -1,10 +1,3 @@
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Linux/SuperH Kernel Configuration"
-
 config SUPERH
 	def_bool y
 	select EMBEDDED
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@ -1,9 +1,3 @@
				@@ -1,9 +1,3 @@
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Linux/SPARC Kernel Configuration"
-
 config 64BIT
 	bool "64-bit kernel" if ARCH = "sparc"
 	default ARCH = "sparc64"
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@ -19,8 +19,6 @@ config MMU
				@@ -19,8 +19,6 @@ config MMU
 config NO_IOMEM
 	def_bool y

-mainmenu "Linux/Usermode Kernel Configuration"
-
 config ISA
 	bool

--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@ -1,6 +1,3 @@
				@@ -1,6 +1,3 @@
-# x86 configuration
-mainmenu "Linux Kernel Configuration for x86"
-
 # Select 32 or 64 bit
 config 64BIT
 	bool "64-bit kernel" if ARCH = "x86"
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@ -1,8 +1,3 @@
				@@ -1,8 +1,3 @@
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-
-mainmenu "Linux/Xtensa Kernel Configuration"
-
 config FRAME_POINTER
 	def_bool n

--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@ -8,7 +8,7 @@ PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-c
				@@ -8,7 +8,7 @@ PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-c
 ifdef KBUILD_KCONFIG
 Kconfig := $(KBUILD_KCONFIG)
 else
-Kconfig := arch/$(SRCARCH)/Kconfig
+Kconfig := Kconfig
 endif

 xconfig: $(obj)/qconf