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>

diff --git a/Kconfig b/Kconfig
new file mode 100644 (file)
index 0000000..c13f48d
--- /dev/null
+++ b/Kconfig
@@ -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"

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 3e2e540a0f2a85ce92aa0a70f604bc4a461c3517..95808c13b2774aca0e0c6118f71b9fa9caf327fe 100644 (file)
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -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

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 98922f7d2d1236dd7fd29fa404447b46189c0222..c3f4fd96051e38a9f58d6e80ebe53d098987a64c 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index f2b3193331841b7ecec7263658de1590da42a9cc..ead727e7f4df21c05a6e1019f6759c6119cd4a2f 100644 (file)
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -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

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index f66294b4f9d29d31fbec1075aabf3483be352309..7051c4ce9b9315d3baf6a1e4ecc142026e75e0da 100644 (file)
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -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 "_"

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index e25bf4440b513d215ae183736268178143289b1d..af8e9821adc556d9b12aa8d55aab5ac64d0e6d3e 100644 (file)
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -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

diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 4b5830bcbe2e21d25f7eca0f4395a7b54b354d07..06256796200aa55ba908c63214011ff37fe34808 100644 (file)
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -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
        int
        default 1000
 
-mainmenu "Fujitsu FR-V Kernel Configuration"
-
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"

diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 53cc669e6d591e94891753fcd375e47fe5e9173b..3fe4d5adf9a2ccb5ae7fc6e4ed0ccd578405f567 100644 (file)
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -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

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 95610820041ea33bf76f9097fcab9d2312a475ea..09ce2ab792e169122c2a11253a328499a916e023 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -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"

diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 3a9319f93e89cdad744622eef5e2bed2aa2b3be7..190270ea7393ddfcaae2b2faa1d9c567b954f55e 100644 (file)
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -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

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 2e3737b92ffca3e36d0005317feee1d38dee526e..1812aa048171100572ffd78be4757c65cf93b286 100644 (file)
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -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
 config ARCH_USES_GETTIMEOFFSET
        def_bool y
 
-mainmenu "Linux/68k Kernel Configuration"
-
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"

diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig
index efeb6033fc1701621b418c4af5bd5046bd7bacaf..e86842dc740a456344c51f99a1859b2568ff7f55 100644 (file)
--- a/arch/m68knommu/Kconfig
+++ b/arch/m68knommu/Kconfig
@@ -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

diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 505a08592423dbd17b7168a2782247c2d401f52e..0c5f43728a71fbadf525dcf65dbace7b465f0c9b 100644 (file)
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -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

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index cdaae942623d0e46e96df91b4dffc21439fdf25f..33771676957d64a3302b6575b077ed640ba489d5 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -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

diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 1c4565a9102b269802129324f1b322eb8834cbbf..7bd617c94dfe528b2ad21762a8d4f63ee887b995 100644 (file)
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -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
        int
        default 1000
 
-mainmenu "Matsushita MN10300/AM33 Kernel Configuration"
-
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 05a366a5c4d5c28431d3910aa69d993e7372e737..82cec342bd301f0aef762c3fba7db065fbe382f8 100644 (file)
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -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

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 2031a2846865e51bb3889742fe3fc60125532a4c..182743b46e0a972aa276d6c3c2f358ca155571d5 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -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

diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index bee1c0f794cf0262b00032493c0b79426d1730e9..3c4d4e69025d14ca3159010ed69c3d9f0cbead22 100644 (file)
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -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
 config ARCH_SUPPORTS_DEBUG_PAGEALLOC
        def_bool y
 
-mainmenu "Linux Kernel Configuration"
-
 config S390
        def_bool y
        select USE_GENERIC_SMP_HELPERS if SMP

diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index 55d413e6dcf2731976cf36de4fd878fc6e57effe..5cbc148addfe2a20f30c2f41c10074912e77d5c3 100644 (file)
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -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

diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 82868fee21fdbed9f670edde147032253f82f459..8ada4757fc9b061ec1c0f19389278974dceb166a 100644 (file)
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -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

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index c0015db247ba46ed787b4b16b47f402a3de1152a..19aa7b253d7832089b92fac947b7c0ee59adaa01 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -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"

diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index 0d207e73a75821df92dfc443c546530650a43e96..e90ca8609e31c12196067a7abf190bb8b7031d43 100644 (file)
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -19,8 +19,6 @@ config MMU
 config NO_IOMEM
        def_bool y
 
-mainmenu "Linux/Usermode Kernel Configuration"
-
 config ISA
        bool
 

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index dcb0593b4a66348a204a44fee3366c5da0848ad1..6c30b9e93d8c2540ad6b513426c26d0aa2b982fc 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -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"

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index ebe228d02b08d6265723306b970a7fd338c5f9ec..9e4ef660c9a5aed3493434fd17db31d42fe876b4 100644 (file)
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -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
 

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index cef3f75e1c2bdd450c20613d563d42da21196795..52c34b914fc7a693bf0f874a6a1adf249ed2df6a 100644 (file)
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -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