kbuild: migrate all arch to the kconfig mainmenu upgrade

Arnaud Lacombe committed 16 years ago

Commit 838a2e51 parent c7abe8625 files · +12 −137Browse files

Unified · Split

25 files

Kconfig +11 −0
arch/alpha/Kconfig +0 −4
arch/arm/Kconfig +0 −7
arch/avr32/Kconfig +0 −7
arch/blackfin/Kconfig +0 −7
arch/cris/Kconfig +0 −7
arch/frv/Kconfig +0 −6
arch/h8300/Kconfig +0 −7
arch/ia64/Kconfig +0 −7
arch/m32r/Kconfig +0 −7
arch/m68k/Kconfig +0 −6
arch/m68knommu/Kconfig +0 −7
arch/microblaze/Kconfig +0 −5
arch/mips/Kconfig +0 −2
arch/mn10300/Kconfig +0 −9
arch/parisc/Kconfig +0 −7
arch/powerpc/Kconfig +0 −6
arch/s390/Kconfig +0 −7
arch/score/Kconfig +0 −5
arch/sh/Kconfig +0 −7
arch/sparc/Kconfig +0 −6
arch/um/Kconfig.common +0 −2
arch/x86/Kconfig +0 −3
arch/xtensa/Kconfig +0 −5
scripts/kconfig/Makefile +1 −1

@@ -0,0 +1,11 @@
	1	+#
	2	+# For a description of the syntax of this configuration file,
	3	+# see Documentation/kbuild/kconfig-language.txt.
	4	+#
	5	+mainmenu "Linux/$ARCH $KERNELVERSION Kernel Configuration"
	6	+
	7	+config SRCARCH
	8	+ string
	9	+ option env="SRCARCH"
	10	+
	11	+source "arch/$SRCARCH/Kconfig"

arch/alpha/Kconfig+0−4

@@ -1,7 +1,3 @@
1		−#
2		−# For a description of the syntax of this configuration file,
3		−# see Documentation/kbuild/kconfig-language.txt.
4		−#
5	1	config ALPHA
6	2	bool
7	3	default y

arch/arm/Kconfig+0−7

@@ -1,10 +1,3 @@
1		−#
2		−# For a description of the syntax of this configuration file,
3		−# see Documentation/kbuild/kconfig-language.txt.
4		−#
5		−
6		−mainmenu "Linux Kernel Configuration"
7		−
8	1	config ARM
9	2	bool
10	3	default y

arch/avr32/Kconfig+0−7

@@ -1,10 +1,3 @@
1		−#
2		−# For a description of the syntax of this configuration file,
3		−# see Documentation/kbuild/kconfig-language.txt.
4		−#
5		−
6		−mainmenu "Linux Kernel Configuration"
7		−
8	1	config AVR32
9	2	def_bool y
10	3	# With EMBEDDED=n, we get lots of stuff automatically selected

arch/blackfin/Kconfig+0−7

@@ -1,10 +1,3 @@
1		−#
2		−# For a description of the syntax of this configuration file,
3		−# see Documentation/kbuild/kconfig-language.txt.
4		−#
5		−
6		−mainmenu "Blackfin Kernel Configuration"
7		−
8	1	config SYMBOL_PREFIX
9	2	string
10	3	default "_"

arch/cris/Kconfig+0−7

@@ -1,10 +1,3 @@
1		−#
2		−# For a description of the syntax of this configuration file,
3		−# see the Configure script.
4		−#
5		−
6		−mainmenu "Linux/CRIS Kernel Configuration"
7		−
8	1	config MMU
9	2	bool
10	3	default y

arch/frv/Kconfig+0−6

@@ -1,7 +1,3 @@
1		−#
2		−# For a description of the syntax of this configuration file,
3		−# see Documentation/kbuild/kconfig-language.txt.
4		−#
5	1	config FRV
6	2	bool
7	3	default y
@@ -64,8 +60,6 @@ config HZ · 56 unmodified lines
64	60	int
65	61	default 1000
66	62
67		−mainmenu "Fujitsu FR-V Kernel Configuration"
68		−
69	63	source "init/Kconfig"
70	64
71	65	source "kernel/Kconfig.freezer"

arch/h8300/Kconfig+0−7

@@ -1,10 +1,3 @@
1		−#
2		−# For a description of the syntax of this configuration file,
3		−# see Documentation/kbuild/kconfig-language.txt.
4		−#
5		−
6		−mainmenu "uClinux/h8300 (w/o MMU) Kernel Configuration"
7		−
8	1	config H8300
9	2	bool
10	3	default y

arch/ia64/Kconfig+0−7

@@ -1,10 +1,3 @@
1		−#
2		−# For a description of the syntax of this configuration file,
3		−# see Documentation/kbuild/kconfig-language.txt.
4		−#
5		−
6		−mainmenu "IA-64 Linux Kernel Configuration"
7		−
8	1	source "init/Kconfig"
9	2
10	3	source "kernel/Kconfig.freezer"

arch/m32r/Kconfig+0−7

@@ -1,10 +1,3 @@
1		−#
2		−# For a description of the syntax of this configuration file,
3		−# see Documentation/kbuild/kconfig-language.txt.
4		−#
5		−
6		−mainmenu "Linux/M32R Kernel Configuration"
7		−
8	1	config M32R
9	2	bool
10	3	default y

arch/m68k/Kconfig+0−6

@@ -1,7 +1,3 @@
1		−#
2		−# For a description of the syntax of this configuration file,
3		−# see Documentation/kbuild/kconfig-language.txt.
4		−#
5	1	config M68K
6	2	bool
7	3	default y
@@ -65,8 +61,6 @@ config GENERIC_TIME · 57 unmodified lines
65	61	config ARCH_USES_GETTIMEOFFSET
66	62	def_bool y
67	63
68		−mainmenu "Linux/68k Kernel Configuration"
69		−
70	64	source "init/Kconfig"
71	65
72	66	source "kernel/Kconfig.freezer"

arch/m68knommu/Kconfig+0−7

@@ -1,10 +1,3 @@
1		−#
2		−# For a description of the syntax of this configuration file,
3		−# see Documentation/kbuild/kconfig-language.txt.
4		−#
5		−
6		−mainmenu "uClinux/68k (w/o MMU) Kernel Configuration"
7		−
8	1	config M68K
9	2	bool
10	3	default y

arch/microblaze/Kconfig+0−5

@@ -1,8 +1,3 @@
1		−# For a description of the syntax of this configuration file,
2		−# see Documentation/kbuild/kconfig-language.txt.
3		−
4		−mainmenu "Linux/Microblaze Kernel Configuration"
5		−
6	1	config MICROBLAZE
7	2	def_bool y
8	3	select HAVE_MEMBLOCK

arch/mips/Kconfig+0−2

@@ -12,8 +12,6 @@ config MIPS · 11 unmodified lines
12	12	select HAVE_FUNCTION_GRAPH_TRACER
13	13	select RTC_LIB if !MACH_LOONGSON
14	14
15		−mainmenu "Linux/MIPS Kernel Configuration"
16		−
17	15	menu "Machine selection"
18	16
19	17	config ZONE_DMA

arch/mn10300/Kconfig+0−9

@@ -1,10 +1,3 @@
1		−#
2		−# For a description of the syntax of this configuration file,
3		−# see Documentation/kbuild/kconfig-language.txt.
4		−#
5		−
6		−mainmenu "Linux Kernel Configuration"
7		−
8	1	config MN10300
9	2	def_bool y
10	3	select HAVE_OPROFILE
@@ -69,8 +62,6 @@ config HZ · 58 unmodified lines
69	62	int
70	63	default 1000
71	64
72		−mainmenu "Matsushita MN10300/AM33 Kernel Configuration"
73		−
74	65	source "init/Kconfig"
75	66
76	67	source "kernel/Kconfig.freezer"

arch/parisc/Kconfig+0−7

@@ -1,10 +1,3 @@
1		−#
2		−# For a description of the syntax of this configuration file,
3		−# see Documentation/kbuild/kconfig-language.txt.
4		−#
5		−
6		−mainmenu "Linux/PA-RISC Kernel Configuration"
7		−
8	1	config PARISC
9	2	def_bool y
10	3	select HAVE_IDE

arch/powerpc/Kconfig+0−6

@@ -1,9 +1,3 @@
1		−# For a description of the syntax of this configuration file,
2		−# see Documentation/kbuild/kconfig-language.txt.
3		−#
4		−
5		−mainmenu "Linux/PowerPC Kernel Configuration"
6		−
7	1	source "arch/powerpc/platforms/Kconfig.cputype"
8	2
9	3	config PPC32

arch/s390/Kconfig+0−7

@@ -1,8 +1,3 @@
1		−#
2		−# For a description of the syntax of this configuration file,
3		−# see Documentation/kbuild/kconfig-language.txt.
4		−#
5		−
6	1	config SCHED_MC
7	2	def_bool y
8	3	depends on SMP
@@ -78,8 +73,6 @@ config VIRT_CPU_ACCOUNTING · 69 unmodified lines
78	73	config ARCH_SUPPORTS_DEBUG_PAGEALLOC
79	74	def_bool y
80	75
81		−mainmenu "Linux Kernel Configuration"
82		−
83	76	config S390
84	77	def_bool y
85	78	select USE_GENERIC_SMP_HELPERS if SMP

arch/score/Kconfig+0−5

@@ -1,8 +1,3 @@
1		−# For a description of the syntax of this configuration file,
2		−# see Documentation/kbuild/kconfig-language.txt.
3		−
4		−mainmenu "Linux/SCORE Kernel Configuration"
5		−
6	1	menu "Machine selection"
7	2
8	3	choice

arch/sh/Kconfig+0−7

@@ -1,10 +1,3 @@
1		−#
2		−# For a description of the syntax of this configuration file,
3		−# see Documentation/kbuild/kconfig-language.txt.
4		−#
5		−
6		−mainmenu "Linux/SuperH Kernel Configuration"
7		−
8	1	config SUPERH
9	2	def_bool y
10	3	select EMBEDDED

arch/sparc/Kconfig+0−6

@@ -1,9 +1,3 @@
1		−# For a description of the syntax of this configuration file,
2		−# see Documentation/kbuild/kconfig-language.txt.
3		−#
4		−
5		−mainmenu "Linux/SPARC Kernel Configuration"
6		−
7	1	config 64BIT
8	2	bool "64-bit kernel" if ARCH = "sparc"
9	3	default ARCH = "sparc64"

arch/um/Kconfig.common+0−2

@@ -19,8 +19,6 @@ config MMU · 18 unmodified lines
19	19	config NO_IOMEM
20	20	def_bool y
21	21
22		−mainmenu "Linux/Usermode Kernel Configuration"
23		−
24	22	config ISA
25	23	bool
26	24

arch/x86/Kconfig+0−3

@@ -1,6 +1,3 @@
1		−# x86 configuration
2		−mainmenu "Linux Kernel Configuration for x86"
3		−
4	1	# Select 32 or 64 bit
5	2	config 64BIT
6	3	bool "64-bit kernel" if ARCH = "x86"

arch/xtensa/Kconfig+0−5

@@ -1,8 +1,3 @@
1		−# For a description of the syntax of this configuration file,
2		−# see Documentation/kbuild/kconfig-language.txt.
3		−
4		−mainmenu "Linux/Xtensa Kernel Configuration"
5		−
6	1	config FRAME_POINTER
7	2	def_bool n
8	3

scripts/kconfig/Makefile+1−1

@@ -8,7 +8,7 @@ PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-c · 7 unmodified lines
8	8	ifdef KBUILD_KCONFIG
9	9	Kconfig := $(KBUILD_KCONFIG)
10	10	else
11		−Kconfig := arch/$(SRCARCH)/Kconfig
	11	+Kconfig := Kconfig
12	12	endif
13	13
14	14	xconfig: $(obj)/qconf

kbuild: migrate all arch to the kconfig mainmenu upgrade

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code