Changeset 04d672c3 in mainline

Timestamp:

2009-03-11T14:26:51Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

63b1537

Parents:

f97e25f

Message:

set CONFIG_DEBUG_SPINLOCK after CONFIG_SMP
do not use serial line on msim

File:

• HelenOS.config (modified) (9 diffs)

HelenOS.config

@@ -242 +242 @@
 ! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] COMPILER (choice)
 
-## Debug build options
+
+## Kernel configuration
+
+% Fences
+! [PLATFORM=ia32&(PROCESSOR=athlon_xp|PROCESSOR=athlon_mp|PROCESSOR=pentium3)] CONFIG_FENCES_P3 (y)
+
+% Fences
+! [PLATFORM=ia32&(PROCESSOR=pentium4|PROCESSOR=core)] CONFIG_FENCES_P4 (y)
+
+% Fences
+! [PLATFORM=amd64] CONFIG_FENCES_P4 (y)
+
+% ACPI support
+! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_ACPI (y)
+
+% Hierarchical page tables support
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_PAGE_PT (y)
+
+% Page hash table support
+! [PLATFORM=ia64|PLATFORM=sparc64] CONFIG_PAGE_HT (y)
+
+% Software integer division support
+! [PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_SOFTINT (y)
+
+% ASID support
+! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID (y)
+
+% ASID FIFO support
+! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y)
+
+% OpenFirmware tree support
+! [PLATFORM=sparc64] CONFIG_OFW_TREE (y)
+
+% Multiboot standard support
+! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_MULTIBOOT (y)
+
+% FPU support
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia64|PLATFORM=sparc64] CONFIG_FPU (y)
+
+% FPU support
+! [PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FPU (y)
+
+
+## Kernel features options
+
+% Support for SMP
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64|(PLATFORM=mips32&MACHINE=msim)] CONFIG_SMP (y/n)
 
 % Debug build
@@ -250 +296 @@
 ! [CONFIG_DEBUG=y&CONFIG_SMP=y] CONFIG_DEBUG_SPINLOCK (y/n)
 
-## Kernel configuration
-
-% Fences
-! [PLATFORM=ia32&(PROCESSOR=athlon_xp|PROCESSOR=athlon_mp|PROCESSOR=pentium3)] CONFIG_FENCES_P3 (y)
-
-% Fences
-! [PLATFORM=ia32&(PROCESSOR=pentium4|PROCESSOR=core)] CONFIG_FENCES_P4 (y)
-
-% Fences
-! [PLATFORM=amd64] CONFIG_FENCES_P4 (y)
-
-% ACPI support
-! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_ACPI (y)
-
-% Hierarchical page tables support
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_PAGE_PT (y)
-
-% Page hash table support
-! [PLATFORM=ia64|PLATFORM=sparc64] CONFIG_PAGE_HT (y)
-
-% Software integer division support
-! [PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_SOFTINT (y)
-
-% ASID support
-! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID (y)
-
-% ASID FIFO support
-! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y)
-
-% OpenFirmware tree support
-! [PLATFORM=sparc64] CONFIG_OFW_TREE (y)
-
-% Multiboot standard support
-! [PLATFORM=ia32|PLATFORM=amd64] CONFIG_MULTIBOOT (y)
-
-% FPU support
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia64|PLATFORM=sparc64] CONFIG_FPU (y)
-
-% FPU support
-! [PLATFORM=mips32&(MACHINE=lgxemul|MACHINE=bgxemul)] CONFIG_FPU (y)
-
-
-## Kernel features options
-
-% Support for SMP
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64|(PLATFORM=mips32&MACHINE=msim)] CONFIG_SMP (y/n)
-
 % Improved support for hyperthreading
 ! [PLATFORM=amd64&CONFIG_SMP=y] CONFIG_HT (y/n)
+
 % Improved support for hyperthreading
 ! [PLATFORM=ia32&PROCESSOR!=athlon_xp&PROCESSOR!=athlon_mp&PROCESSOR!=pentium3&CONFIG_SMP=y] CONFIG_HT (y/n)
@@ -328 +328 @@
 % Compile kernel tests
 ! CONFIG_TEST (y/n)
+
 
 ## Hardware support
@@ -337 +338 @@
 @ "none" No input device
 ! [MACHINE!=msim&MACHINE!=ski&MACHINE!=serengeti] CONFIG_HID_IN (choice)
+
 % Input device class
 @ "serial" Serial line
-! [MACHINE=msim|MACHINE=ski|machine=serengeti] CONFIG_HID_IN (choice)
+! [MACHINE=ski|MACHINE=serengeti] CONFIG_HID_IN (choice)
 
 % Output device class
@@ -347 +349 @@
 @ "none" No output device
 ! [MACHINE!=msim&MACHINE!=ski&MACHINE!=serengeti] CONFIG_HID_OUT (choice)
+
 % Output device class
 @ "serial" Serial line
@@ -353 +356 @@
 % i8042 controller support
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_I8042 (y/n)
+
 % i8042 controller support
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&MACHINE=i460GX] CONFIG_I8042 (y/n)
@@ -358 +362 @@
 % Support for NS16550 controller
 ! [PLATFORM=sparc64&CONFIG_HID_OUT!=none&CONFIG_HID_IN!=none] CONFIG_NS16550 (y/n)
+
 % Support for NS16550 controller 
 ! [CONFIG_HID_IN=generic|CONFIG_HID_IN=serial|CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial] CONFIG_NS16550 (y/n)
@@ -369 +374 @@
 % PC keyboard support
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n)
+
 % PC keyboard support
 ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&MACHINE=i460GX] CONFIG_PC_KBD (y/n)
@@ -380 +386 @@
 % EGA support
 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor)&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_EGA (y/n)
+
 % EGA support
 ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=monitor)&MACHINE=i460GX] CONFIG_EGA (y/n)