Changeset 41f7564 in mainline for kernel/kernel.config

Timestamp:

2006-07-17T00:53:53Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

231fcb2

Parents:

41c4444

Message:

cleanup and unify the build system

File:

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

kernel/kernel.config

@@ -8 +8 @@
 @ "ppc32" PowerPC 32-bit
 @ "ppc64" PowerPC 64-bit
-@ "sparc64" Sun UltraSPARC
+@ "sparc64" Sun UltraSPARC 64-bit
 @ "xen32" Xen 32-bit
 ! ARCH (choice)
-
-# IA32 Compiler
-@ "cross" Cross-compiler
-@ "native" Native
-! [ARCH=ia32] IA32_COMPILER (choice)
-% [ARCH=ia32] SAVEAS IA32_COMPILER COMPILER
-
-# AMD64 Compiler
-@ "cross" Cross-compiler
-@ "native" Native
-! [ARCH=amd64] AMD64_COMPILER (choice)
-% [ARCH=amd64] SAVEAS AMD64_COMPILER COMPILER
 
 # Compiler
 @ "cross" Cross-compiler
 @ "native" Native
-! [(ARCH!=amd64)&(ARCH!=ia32)] OTHER_COMPILER (choice)
-% [(ARCH!=amd64)&(ARCH!=ia32)] SAVEAS OTHER_COMPILER COMPILER
-
+! COMPILER (choice)
 
 # CPU type
@@ -37 +23 @@
 @ "athlon-mp" Athlon MP
 @ "prescott" Prescott
-! [ARCH=ia32|ARCH=xen32] IA32_CPU (choice)
+! [ARCH=ia32|ARCH=xen32] MACHINE (choice)
 
-# MIPS Machine type
+# CPU type
+@ "opteron" Opteron
+! [ARCH=amd64] MACHINE (choice)
+
+# Machine type
 @ "msim" MSIM Simulator
 @ "simics" Virtutech Simics simulator
@@ -45 +35 @@
 @ "bgxemul" GXEmul Big Endian
 @ "indy" SGI Indy
-! [ARCH=mips32] MIPS_MACHINE (choice)
+! [ARCH=mips32] MACHINE (choice)
 
 # Framebuffer support
-! [(ARCH=mips32&MIPS_MACHINE=lgxemul)|(ARCH=mips32&MIPS_MACHINE=bgxemul)|(ARCH=ia32)|(ARCH=amd64)|(ARCH=xen32)] CONFIG_FB (y/n)
+! [(ARCH=mips32&MACHINE=lgxemul)|(ARCH=mips32&MACHINE=bgxemul)|(ARCH=ia32)|(ARCH=amd64)|(ARCH=xen32)] CONFIG_FB (y/n)
 
 # Framebuffer width
-@ "320"
 @ "640"
 @ "800"
@@ -64 +53 @@
 
 # Framebuffer height
-@ "200"
-@ "240"
-@ "400"
 @ "480"
 @ "600"
@@ -85 +71 @@
 ! [(ARCH=ia32|ARCH=amd64|ARCH=xen32)&CONFIG_FB=y] CONFIG_VESA_BPP (choice)
 
-
-
 # Support for SMP
 ! [ARCH=ia32|ARCH=amd64|ARCH=xen32] CONFIG_SMP (y/n)
@@ -97 +81 @@
 
 # Lazy FPU context switching
-! [(ARCH=mips32&MIPS_MACHINE!=msim&MIPS_MACHINE!=simics)|ARCH=amd64|ARCH=ia32|ARCH=ia64|ARCH=xen32] CONFIG_FPU_LAZY (y/n)
+! [(ARCH=mips32&MACHINE!=msim&MACHINE!=simics)|ARCH=amd64|ARCH=ia32|ARCH=ia64|ARCH=xen32] CONFIG_FPU_LAZY (y/n)
 
 # Power off on halt
@@ -117 +101 @@
 
 # Use VHPT
-! [ARCH=ia64] CONFIG_VHPT (y/n)
+! [ARCH=ia64] CONFIG_VHPT (n/y)
 
 ## Run-time configuration directives
@@ -134 +118 @@
 @ [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=mips32&MIPS_MACHINE!=msim&MIPS_MACHINE!=simics] "fpu/mips1" Mips FPU test 1
+@ [ARCH=mips32&MACHINE!=msim&MACHINE!=simics] "fpu/mips1" MIPS FPU test 1
 @ "print/print1" Printf test 1
 @ "thread/thread1" Thread test 1
@@ -140 +124 @@
 @ "mm/falloc1" Frame Allocation test 1
 @ "mm/falloc2" Frame Allocation test 2
-@ "mm/slab1" SLAB test1 - No CPU-cache
+@ "mm/slab1" SLAB test1 - No CPU cache
 @ "mm/slab2" SLAB test2 - SMP CPU cache
 @ "fault/fault1" Write to NULL (maybe page fault)
 @ "sysinfo" Sysinfo fill and dump test
 @ [ARCH=ia64] "mm/purge1" Itanium TLB purge test
-@ [ARCH=mips32] "debug/mips1" Mips breakpoint-debug test 
+@ [ARCH=mips32] "debug/mips1" MIPS breakpoint-debug test 
 ! CONFIG_TEST (choice)