Changeset 944b15c in mainline for kernel.config

Timestamp:

2005-12-08T16:15:20Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

b00fdde

Parents:

ac0cb2a

Message:

Configuration tweaks, now supports both CNF and DNF in config.file.

File:

• kernel.config (modified) (3 diffs)

kernel.config

@@ -37 +37 @@
 ! [ARCH=ia32] IA32_CPU (choice)
 
+# MIPS Machine Type
+@ "msim" MSIM Simulator
+@ "simics" Virtutech Simics simulator
+@ "lgxemul" GXEmul Little Endian
+@ "bgxemul" GXEmul Big Endian
+@ "indy" SGI Indy
+! [ARCH=mips32] MIPS_MACHINE (choice)
+
 # Support for SMP
-! CONFIG_SMP (y/n)
+! [ARCH=ia32|ARCH=amd64] CONFIG_SMP (y/n)
 
 # Improved support for hyperthreading
@@ -44 +52 @@
 
 # Lazy FPU context switching
-! CONFIG_FPU_LAZY (y/n)
-
-# MIPS Machine Type
-@ "msim" MSIM Simulator
-@ "msim4kc" MSIM Simulator with 4kc instruction set
-@ "simics" Virtutech Simics simulator
-@ "lgxemul" GXEmul Little Endian
-@ "bgxemul" GXEmul Big Endian
-@ "indy" SGI Indy
-! [ARCH=mips32] MIPS_MACHINE (choice)
+! [(ARCH=mips32&MIPS_MACHINE!=msim)|ARCH=amd64|ARCH=ia32] CONFIG_FPU_LAZY (y/n)
 
 ## Debugging configuration directives
@@ -79 +78 @@
 @ [ARCH=ia32|ARCH=amd64] "fpu/fpu1" Intel fpu test 1
 @ [ARCH=ia32|ARCH=amd64] "fpu/sse1" Intel Sse test 1
-@ [ARCH=mips32&MIPS_MACHINE!=msim&MIPS_MACHINE!=msim4kc] "fpu/mips1" Mips FPU test 1
+@ [ARCH=mips32&MIPS_MACHINE!=msim] "fpu/mips1" Mips FPU test 1
 @ "print/print1" Printf test 1
 @ "thread/trhead1" Thread test 1