Changeset 57ce359 in mainline for kernel/kernel.config

Timestamp:

2006-10-22T18:27:57Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

19dce27

Parents:

2191541

Message:

Rename xen32 to ia32xen.
The name seems to be more logical as Xen supports more host architectures.

File:

• kernel/kernel.config (modified) (7 diffs)

kernel/kernel.config

@@ -4 +4 @@
 @ "amd64" AMD64/Intel EM64T
 @ "ia32" Intel IA-32
+@ "ia32xen" Intel IA-32 on Xen hypervisor
 @ "ia64" Intel IA-64
 @ "mips32" MIPS 32-bit
@@ -9 +10 @@
 @ "ppc64" PowerPC 64-bit
 @ "sparc64" Sun UltraSPARC 64-bit
-@ "xen32" Xen 32-bit
 ! ARCH (choice)
 
@@ -23 +23 @@
 @ "athlon-mp" Athlon MP
 @ "prescott" Prescott
-! [ARCH=ia32|ARCH=xen32] MACHINE (choice)
+! [ARCH=ia32|ARCH=ia32xen] MACHINE (choice)
 
 # CPU type
@@ -72 +72 @@
 
 # Support for SMP
-! [ARCH=ia32|ARCH=amd64|ARCH=xen32|ARCH=sparc64] CONFIG_SMP (y/n)
+! [ARCH=ia32|ARCH=amd64|ARCH=ia32xen|ARCH=sparc64] CONFIG_SMP (y/n)
 
 # Improved support for hyperthreading
-! [(ARCH=ia32|ARCH=amd64|ARCH=xen32)&CONFIG_SMP=y] CONFIG_HT (y/n)
+! [(ARCH=ia32|ARCH=amd64|ARCH=ia32xen)&CONFIG_SMP=y] CONFIG_HT (y/n)
 
 # Simics BIOS AP boot fix
@@ -81 +81 @@
 
 # Lazy FPU context switching
-! [(ARCH=mips32&MACHINE!=msim&MACHINE!=simics)|ARCH=amd64|ARCH=ia32|ARCH=ia64|ARCH=sparc64|ARCH=xen32] CONFIG_FPU_LAZY (y/n)
+! [(ARCH=mips32&MACHINE!=msim&MACHINE!=simics)|ARCH=amd64|ARCH=ia32|ARCH=ia64|ARCH=sparc64|ARCH=ia32xen] CONFIG_FPU_LAZY (y/n)
 
 # Power off on halt
@@ -95 +95 @@
 
 # Watchpoint on rewriting AS with zero
-! [CONFIG_DEBUG=y&(ARCH=amd64|ARCH=ia32|ARCH=xen32)] CONFIG_DEBUG_AS_WATCHPOINT (y/n)
+! [CONFIG_DEBUG=y&(ARCH=amd64|ARCH=ia32|ARCH=ia32xen)] CONFIG_DEBUG_AS_WATCHPOINT (y/n)
 
 # Save all interrupt registers
-! [CONFIG_DEBUG=y&(ARCH=amd64|ARCH=mips32|ARCH=ia32|ARCH=xen32)] CONFIG_DEBUG_ALLREGS (y/n)
+! [CONFIG_DEBUG=y&(ARCH=amd64|ARCH=mips32|ARCH=ia32|ARCH=ia32xen)] CONFIG_DEBUG_ALLREGS (y/n)
 
 # Use VHPT
@@ -125 +125 @@
 @ "synch/semaphore1" Semaphore test 1
 @ "synch/semaphore2" Sempahore test 2
-@ [ARCH=ia32|ARCH=amd64|ARCH=ia64|ARCH=xen32] "fpu/fpu1" Intel FPU test 1
-@ [ARCH=ia32|ARCH=amd64|ARCH=xen32] "fpu/sse1" Intel SSE test 1
+@ [ARCH=ia32|ARCH=amd64|ARCH=ia64|ARCH=ia32xen] "fpu/fpu1" Intel FPU test 1
+@ [ARCH=ia32|ARCH=amd64|ARCH=ia32xen] "fpu/sse1" Intel SSE test 1
 @ [ARCH=mips32&MACHINE!=msim&MACHINE!=simics] "fpu/mips1" MIPS FPU test 1
 @ "print/print1" Printf test 1