x86: enable "make ARCH=x86"

After unification of the Kconfig files and introducing K64BIT support in kconfig it required only trivial changes to enable "make ARCH=x86". With this patch you can build for x86_64 in several ways: 1) make ARCH=x86_64 2) make ARCH=x86 K64BIT=y 3) make ARCH=x86 menuconfig => select 64-bit Likewise for i386 with the addition that i386 is default is you say ARCH=x86. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com>

x86: enable "make ARCH=x86"
After unification of the Kconfig files and introducing K64BIT support in kconfig it required only trivial changes to enable "make ARCH=x86". With this patch you can build for x86_64 in several ways: 1) make ARCH=x86_64 2) make ARCH=x86 K64BIT=y 3) make ARCH=x86 menuconfig => select 64-bit Likewise for i386 with the addition that i386 is default is you say ARCH=x86. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: "H. Peter Anvin" <hpa@zytor.com>
Sam Ravnborg
1 parent d746d647f3
Showing 5 changed files with 19 additions and 48 deletions Side-by-side Diff
Makefile
arch/x86/Kconfig
arch/x86/Kconfig.i386
arch/x86/Kconfig.x86_64
scripts/kconfig/Makefile
@@ -200,9 +200,11 @@
 # Additional ARCH settings for x86
 ifeq ($(ARCH),i386)
         SRCARCH := x86
+        K64BIT  := n
 endif
 ifeq ($(ARCH),x86_64)
         SRCARCH := x86
+        K64BIT  := y
 endif
  
 KCONFIG_CONFIG	?= .config
@@ -339,7 +341,7 @@
 KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
  
 export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
-export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
+export ARCH SRCARCH K64BIT CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
 export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE
 export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
  
 # x86 configuration
+mainmenu "Linux Kernel Configuration for x86"
  
+# Select 32 or 64 bit
+config 64BIT
+	bool "64-bit kernel"
+	default n
+	help
+	  Say yes to build a 64-bit kernel - formerly known as x86_64
+	  Say no to build a 32-bit kernel - formerly known as i386
+
+config X86_32
+	def_bool !64BIT
+
+config X86_64
+	def_bool 64BIT
+
 ### Arch settings
 config X86
 	bool
 	default y
-
-config 64BIT
-	def_bool X86_64
  
 config GENERIC_TIME
 	bool
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-
-mainmenu "Linux Kernel Configuration"
-
-config X86_32
-	bool
-	default y
-	help
-	  This is Linux's home port.  Linux was originally native to the Intel
-	  386, and runs on all the later x86 processors including the Intel
-	  486, 586, Pentiums, and various instruction-set-compatible chips by
-	  AMD, Cyrix, and others.
-
-
-source "arch/x86/Kconfig"
-#
-# For a description of the syntax of this configuration file,
-# see Documentation/kbuild/kconfig-language.txt.
-#
-# Note: ISA is disabled and will hopefully never be enabled.
-# If you managed to buy an ISA x86-64 box you'll have to fix all the
-# ISA drivers you need yourself.
-#
-
-mainmenu "Linux Kernel Configuration"
-
-config X86_64
-	bool
-	default y
-	help
-	  Port to the x86-64 architecture. x86-64 is a 64-bit extension to the
-	  classical 32-bit x86 architecture. For details see
-	  <http://www.x86-64.org/>.
-
-source "arch/x86/Kconfig"
@@ -4,12 +4,7 @@
  
 PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config
  
-# If a arch/$(SRCARCH)/Kconfig.$(ARCH) file exist use it
-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/Kconfig.$(ARCH)),)
-        Kconfig := arch/$(SRCARCH)/Kconfig.$(ARCH)
-else
-        Kconfig := arch/$(SRCARCH)/Kconfig
-endif
+Kconfig := arch/$(SRCARCH)/Kconfig
  
 xconfig: $(obj)/qconf
 	$< $(Kconfig)
...	...	@@ -200,9 +200,11 @@
200	200	# Additional ARCH settings for x86
201	201	ifeq ($(ARCH),i386)
202	202	SRCARCH := x86
	203	+ K64BIT := n
203	204	endif
204	205	ifeq ($(ARCH),x86_64)
205	206	SRCARCH := x86
	207	+ K64BIT := y
206	208	endif
207	209
208	210	KCONFIG_CONFIG ?= .config
...	...	@@ -339,7 +341,7 @@
339	341	KERNELVERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
340	342
341	343	export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION
342		-export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
	344	+export ARCH SRCARCH K64BIT CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC
343	345	export CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE
344	346	export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS
345	347
1	1	# x86 configuration
	2	+mainmenu "Linux Kernel Configuration for x86"
2	3
	4	+# Select 32 or 64 bit
	5	+config 64BIT
	6	+ bool "64-bit kernel"
	7	+ default n
	8	+ help
	9	+ Say yes to build a 64-bit kernel - formerly known as x86_64
	10	+ Say no to build a 32-bit kernel - formerly known as i386
	11	+
	12	+config X86_32
	13	+ def_bool !64BIT
	14	+
	15	+config X86_64
	16	+ def_bool 64BIT
	17	+
3	18	### Arch settings
4	19	config X86
5	20	bool
6	21	default y
7		-
8		-config 64BIT
9		- def_bool X86_64
10	22
11	23	config GENERIC_TIME
12	24	bool
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		-config X86_32
9		- bool
10		- default y
11		- help
12		- This is Linux's home port. Linux was originally native to the Intel
13		- 386, and runs on all the later x86 processors including the Intel
14		- 486, 586, Pentiums, and various instruction-set-compatible chips by
15		- AMD, Cyrix, and others.
16		-
17		-
18		-source "arch/x86/Kconfig"
1		-#
2		-# For a description of the syntax of this configuration file,
3		-# see Documentation/kbuild/kconfig-language.txt.
4		-#
5		-# Note: ISA is disabled and will hopefully never be enabled.
6		-# If you managed to buy an ISA x86-64 box you'll have to fix all the
7		-# ISA drivers you need yourself.
8		-#
9		-
10		-mainmenu "Linux Kernel Configuration"
11		-
12		-config X86_64
13		- bool
14		- default y
15		- help
16		- Port to the x86-64 architecture. x86-64 is a 64-bit extension to the
17		- classical 32-bit x86 architecture. For details see
18		- <http://www.x86-64.org/>.
19		-
20		-source "arch/x86/Kconfig"
...	...	@@ -4,12 +4,7 @@
4	4
5	5	PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config
6	6
7		-# If a arch/$(SRCARCH)/Kconfig.$(ARCH) file exist use it
8		-ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/Kconfig.$(ARCH)),)
9		- Kconfig := arch/$(SRCARCH)/Kconfig.$(ARCH)
10		-else
11		- Kconfig := arch/$(SRCARCH)/Kconfig
12		-endif
	7	+Kconfig := arch/$(SRCARCH)/Kconfig
13	8
14	9	xconfig: $(obj)/qconf
15	10	$< $(Kconfig)