Changeset 1c6b3a2 in mainline

Timestamp:

2009-03-07T20:36:15Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9482bf0b

Parents:

1515522

Message:

Improve the configuration file.

• Support for easy configuration with sane defaults.

• Fix the ambiguous MACHINE variable by introducing the PROCESSOR variable.

• Eliminate some unnecessarily detailed questions by providing defaults for the Serengeti machine.

• Introduce CONFIG_HID_IN and CONFIG_HID_OUT variables. They help to limit the number of offered HID devices. In the future, they can be also used to configure the way how the serial controller devices are connected to the keyboard / serial line modules on some platforms where we can't autodetect.

Files:

• HelenOS.config (modified) (12 diffs)
• kernel/arch/amd64/Makefile.inc (modified) (1 diff)
• kernel/arch/ia32/Makefile.inc (modified) (1 diff)
• kernel/arch/sparc64/Makefile.inc (modified) (1 diff)

HelenOS.config

@@ -28 +28 @@
 #
 
+## Configuration options
+
+% Assume sane defaults where sensible?
+! DEFAULTS (y/n)
 
 ## General platform options
@@ -57 +61 @@
 ! [PLATFORM=ia64] MACHINE (choice)
 
+% Machine type
+@ "generic" Generic Sun workstation or server
+@ "serengeti" Serengeti system
+! [PLATFORM=sparc64] MACHINE (choice)
+
 % CPU type
 @ "pentium4" Pentium 4
@@ -63 +72 @@
 @ "athlon_xp" Athlon XP
 @ "athlon_mp" Athlon MP
-! [PLATFORM=ia32] MACHINE (choice)
+! [DEFAULTS=n&PLATFORM=ia32] PROCESSOR (choice)
+
+% CPU type
+@ "pentium4" Pentium 4
+! [DEFAULTS=y&PLATFORM=ia32] PROCESSOR (choice)
 
 % CPU type
 @ "opteron" Opteron
-! [PLATFORM=amd64] MACHINE (choice)
+! [PLATFORM=amd64] PROCESSOR (choice)
 
 % CPU type
 @ "us" UltraSPARC I-II subarchitecture
 @ "us3" UltraSPARC III-IV subarchitecture
-! [PLATFORM=sparc64] MACHINE (choice)
+! [PLATFORM=sparc64&MACHINE=generic] PROCESSOR (choice)
+
+% CPU type
+@ "us3"
+! [PLATFORM=sparc64&MACHINE=serengeti] PROCESSOR (choice)
 
 % Ramdisk format
@@ -215 +232 @@
 @ "icc_native" ICC Native
 @ "suncc_native" Sun Studio C Compiler
-! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
+! [DEFAULTS=n&(PLATFORM=amd64|PLATFORM=ia32)] COMPILER (choice)
 
 % Compiler
@@ -221 +238 @@
 @ "gcc_native" GCC Native
 @ "icc_native" ICC Native
-! [PLATFORM=ia64] COMPILER (choice)
+! [DEFAULTS=n&PLATFORM=ia64] COMPILER (choice)
 
 % Compiler
@@ -227 +244 @@
 @ "gcc_native" GCC Native
 @ "suncc_native" Sun Studio C Compiler
-! [PLATFORM=sparc64] COMPILER (choice)
+! [DEFAULTS=n&PLATFORM=sparc64] COMPILER (choice)
 
 % Compiler
 @ "gcc_cross" GCC Cross-compiler
 @ "gcc_native" GCC Native
-! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] COMPILER (choice)
-
+! [DEFAULTS=n&(PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32)] COMPILER (choice)
+
+% Compiler
+@ "gcc_cross" GCC Cross-compiler
+! [DEFAULTS=y] COMPILER (choice)
 
 ## Debug build options
 
 % Debug build
-! CONFIG_DEBUG (y/n)
-
+! [DEFAULTS=n]CONFIG_DEBUG (y/n)
+% Debug build
+! [DEFAULTS=y]CONFIG_DEBUG (y)
+
+% Deadlock detection support for spinlocks
+! [DEFAULTS=n&CONFIG_DEBUG=y&CONFIG_SMP=y] CONFIG_DEBUG_SPINLOCK (y/n)
+% Deadlock detection support for spinlocks
+! [DEFAULTS=y&CONFIG_DEBUG=y&CONFIG_SMP=y] CONFIG_DEBUG_SPINLOCK (y)
 
 ## Kernel configuration
 
 % Fences
-! [PLATFORM=ia32&(MACHINE=athlon_xp|MACHINE=athlon_mp|MACHINE=pentium3)] CONFIG_FENCES_P3 (y)
+! [PLATFORM=ia32&(PROCESSOR=athlon_xp|PROCESSOR=athlon_mp|PROCESSOR=pentium3)] CONFIG_FENCES_P3 (y)
 
 % Fences
-! [PLATFORM=ia32&(MACHINE=pentium4|MACHINE=core)] CONFIG_FENCES_P4 (y)
+! [PLATFORM=ia32&(PROCESSOR=pentium4|PROCESSOR=core)] CONFIG_FENCES_P4 (y)
 
 % Fences
@@ -286 +312 @@
 
 % Support for SMP
-! [(PLATFORM=ia32&MACHINE!=athlon_xp)|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64|(PLATFORM=mips32&MACHINE=msim)] CONFIG_SMP (y/n)
+! [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)
-
+! [DEFAULTS=n&PLATFORM=amd64&CONFIG_SMP=y] CONFIG_HT (y/n)
 % Improved support for hyperthreading
-! [PLATFORM=ia32&MACHINE!=athlon_xp&MACHINE!=athlon_mp&MACHINE!=pentium3&CONFIG_SMP=y] CONFIG_HT (y/n)
+! [DEFAULTS=y&PLATFORM=amd64&CONFIG_SMP=y] CONFIG_HT (y)
+% Improved support for hyperthreading
+! [DEFAULTS=n&PLATFORM=ia32&PROCESSOR!=athlon_xp&PROCESSOR!=athlon_mp&PROCESSOR!=pentium3&CONFIG_SMP=y] CONFIG_HT (y/n)
+% Improved support for hyperthreading
+! [DEFAULTS=y&PLATFORM=ia32&PROCESSOR!=athlon_xp&PROCESSOR!=athlon_mp&PROCESSOR!=pentium3&CONFIG_SMP=y] CONFIG_HT (y)
 
 % Lazy FPU context switching
-! [CONFIG_FPU=y] CONFIG_FPU_LAZY (y/n)
+! [DEFAULTS=n&CONFIG_FPU=y] CONFIG_FPU_LAZY (y/n)
+% Lazy FPU context switching
+! [DEFAULTS=y&CONFIG_FPU=y] CONFIG_FPU_LAZY (y)
 
 % Use VHPT
-! [PLATFORM=ia64] CONFIG_VHPT (n/y)
+! [DEFAULTS=n&PLATFORM=ia64] CONFIG_VHPT (n/y)
 
 % Use TSB
-! [PLATFORM=sparc64] CONFIG_TSB (y/n)
+! [DEFAULTS=n&PLATFORM=sparc64] CONFIG_TSB (y/n)
+% Use TSB
+! [DEFAULTS=y&PLATFORM=sparc64] CONFIG_TSB (y)
+
+% IO SAPIC on default address support
+! [DEFAULTS=n&PLATFORM=ia64&MACHINE!=ski] CONFIG_IOSAPIC (y/n)
+% IO SAPIC on default address support
+! [DEFAULTS=y&PLATFORM=ia64&MACHINE!=ski] CONFIG_IOSAPIC (y)
+
+% Virtually indexed D-cache support
+! [DEFAULTS=n&PLATFORM=sparc64] CONFIG_VIRT_IDX_DCACHE (y/n)
+% Virtually indexed D-cache support
+! [DEFAULTS=y&PLATFORM=sparc64] CONFIG_VIRT_IDX_DCACHE (y)
+
+% Support for userspace debuggers
+! [DEFAULTS=n] CONFIG_UDEBUG (y/n)
+% Support for userspace debuggers
+! [DEFAULTS=y] CONFIG_UDEBUG (y)
+
+% Kernel console support
+! [DEFAULTS=n] CONFIG_KCONSOLE (y/n)
+% Kernel console support
+! [DEFAULTS=y] CONFIG_KCONSOLE (y)
+
+% Detailed kernel logging
+! [DEFAULTS=n] CONFIG_LOG (n/y)
+
+% Compile kernel tests
+! [DEFAULTS=n] CONFIG_TEST (y/n)
+% Compile kernel tests
+! [DEFAULTS=y] CONFIG_TEST (y)
+
+## Hardware support
+
+% What is your input device?
+@ "keyboard" Keyboard
+@ "serial" Serial line
+! CONFIG_HID_IN (choice)
+
+% What is your output device?
+@ "monitor" Monitor
+@ "serial" Serial line
+! CONFIG_HID_OUT (choice)
 
 % i8042 controller support
-! [PLATFORM=ia32|PLATFORM=amd64|(PLATFORM=ia64&MACHINE=i460GX)] CONFIG_I8042 (y/n)
+! [CONFIG_HID_IN=keyboard&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_I8042 (y/n)
+% i8042 controller support
+! [CONFIG_HID_IN=keyboard&PLATFORM=ia64&MACHINE=i460GX] CONFIG_I8042 (y/n)
 
 % Support for NS16550 serial port
-! [PLATFORM=sparc64] CONFIG_NS16550 (y/n)
-
+! [CONFIG_HID_IN=serial|PLATFORM=sparc64] CONFIG_NS16550 (y/n)
 % Support for NS16550 serial port
-! [PLATFORM=ia64&MACHINE!=ski] CONFIG_NS16550 (n/y)
+! [CONFIG_HID_IN=serial&PLATFORM=ia64&MACHINE=i460GX] CONFIG_NS16550 (y/n)
 
 % Support for Z8530 serial port
@@ -316 +390 @@
 
 % Support for Serengeti console
-! [PLATFORM=sparc64] CONFIG_SGCN (y/n)
+! [CONFIG_HID_IN=serial&PLATFORM=sparc64&MACHINE=serengeti] CONFIG_SGCN (y/n)
 
 % PC keyboard support
-! [PLATFORM=ia32|PLATFORM=amd64|(PLATFORM=ia64&MACHINE=i460GX)] CONFIG_PC_KBD (y/n)
+! [CONFIG_HID_IN=keyboard&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_PC_KBD (y/n)
+% PC keyboard support
+! [CONFIG_HID_IN=keyboard&PLATFORM=ia64&MACHINE=i460GX] CONFIG_PC_KBD (y/n)
 
 % Sun keyboard support
-! [PLATFORM=sparc64] CONFIG_SUN_KBD (y/n)
+! [CONFIG_HID_IN=keyboard&PLATFORM=sparc64] CONFIG_SUN_KBD (y/n)
 
 % Serial line input module
-! [PLATFORM=ia64&machine!=ski] CONFIG_SRLN (n/y)
+! [CONFIG_HID_IN=serial] CONFIG_SRLN (y/n)
 
 % EGA support
-! [PLATFORM=ia32|PLATFORM=amd64|(PLATFORM=ia64&MACHINE=i460GX)] CONFIG_EGA (y)
-
-% IOSapic on default address support
-! [PLATFORM=ia64&MACHINE!=ski] CONFIG_IOSAPIC (y/n)
-
-% Virtually indexed D-cache support
-! [PLATFORM=sparc64] CONFIG_VIRT_IDX_DCACHE (y/n)
-
-% Support for userspace debuggers
-! CONFIG_UDEBUG (y/n)
-
-% Kernel console support
-! CONFIG_KCONSOLE (y/n)
-
-% Detailed kernel logging
-! CONFIG_LOG (n/y)
-
-% Deadlock detection support for spinlocks
-! [CONFIG_DEBUG=y&CONFIG_SMP=y] CONFIG_DEBUG_SPINLOCK (y/n)
-
-% Compile kernel tests
-! CONFIG_TEST (y/n)
-
-
-## Hardware support
+! [CONFIG_HID_OUT=monitor&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_EGA (y/n)
+% EGA support
+! [CONFIG_HID_OUT=monitor&PLATFORM=ia64&MACHINE=i460GX] CONFIG_EGA (y/n)
 
 % Framebuffer support
-! [(PLATFORM=mips32&MACHINE=lgxemul)|(PLATFORM=mips32&MACHINE=bgxemul)|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|(PLATFORM=sparc64&MACHINE=us3)] CONFIG_FB (y/n)
-
-% Framebuffer support
-! [PLATFORM=ppc32|(PLATFORM=sparc64&MACHINE=us)] CONFIG_FB (y)
+! [CONFIG_HID_OUT=monitor] CONFIG_FB (y/n)
 
 % Framebuffer width
@@ -370 +421 @@
 @ "1600"
 @ "2048"
-! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_FB=y] CONFIG_VESA_WIDTH (choice)
+! [DEFAULTS=n&(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_FB=y] CONFIG_VESA_WIDTH (choice)
+
+% Framebuffer width
+@ "800"
+! [DEFAULTS=y&(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_FB=y] CONFIG_VESA_WIDTH (choice)
 
 % Framebuffer height
@@ -383 +438 @@
 @ "1200"
 @ "1536"
-! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_FB=y] CONFIG_VESA_HEIGHT (choice)
+! [DEFAULTS=n&(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_FB=y] CONFIG_VESA_HEIGHT (choice)
+
+% Framebuffer height
+@ "600"
+! [DEFAULTS=y&(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_FB=y] CONFIG_VESA_HEIGHT (choice)
 
 % Framebuffer depth
@@ -389 +448 @@
 @ "16"
 @ "24"
-! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_FB=y] CONFIG_VESA_BPP (choice)
+! [DEFAULTS=n&(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_FB=y] CONFIG_VESA_BPP (choice)
+
+% Framebuffer depth
+@ "16"
+! [DEFAULTS=y&(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_FB=y] CONFIG_VESA_BPP (choice)
 
 % Start AP processors by the loader
-! [PLATFORM=sparc64&CONFIG_SMP=y] CONFIG_AP (y/n)
+! [DEFAULTS=n&PLATFORM=sparc64&CONFIG_SMP=y] CONFIG_AP (y/n)
+% Start AP processors by the loader
+! [DEFAULTS=y&PLATFORM=sparc64&CONFIG_SMP=y] CONFIG_AP (y)
 
 % Use Block Address Translation by the loader
-! [PLATFORM=ppc32] CONFIG_BAT (y/n)
+! [DEFAULTS=n&PLATFORM=ppc32] CONFIG_BAT (y/n)
+% Use Block Address Translation by the loader
+! [DEFAULTS=y&PLATFORM=ppc32] CONFIG_BAT (y)
 
 % Preserve A.OUT header in isofs.b
-! [PLATFORM=sparc64] CONFIG_AOUT_ISOFS_B (y/n)
+! [PLATFORM=sparc64&MACHINE=generic] CONFIG_AOUT_ISOFS_B (y)
 
 % External ramdisk
@@ -406 +473 @@
 @ "us_qwerty" US QWERTY
 @ "us_dvorak" US Dvorak
-! KBD_LAYOUT (choice)
+! [DEFAULTS=n&CONFIG_HID_IN=keyboard] KBD_LAYOUT (choice)
+% Keyboard layout
+@ "us_qwerty" US QWERTY
+! [DEFAULTS=y&CONFIG_HID_IN=keyboard] KBD_LAYOUT (choice)

kernel/arch/amd64/Makefile.inc

@@ -47 +47 @@
 #
 
-ifeq ($(MACHINE),opteron)
+ifeq ($(PROCESSOR),opteron)
         CMN2 := -march=opteron
         GCC_CFLAGS += $(CMN2)

kernel/arch/ia32/Makefile.inc

@@ -46 +46 @@
 #
 
-ifeq ($(MACHINE),athlon_xp)
+ifeq ($(PROCESSOR),athlon_xp)
         CMN2 = -march=athlon-xp
         SUNCC_CFLAGS += -xarch=ssea
 endif
-ifeq ($(MACHINE),athlon_mp)
+ifeq ($(PROCESSOR),athlon_mp)
         CMN2 = -march=athlon-mp
         SUNCC_CFLAGS += xarch=ssea
 endif
-ifeq ($(MACHINE),pentium3)
+ifeq ($(PROCESSOR),pentium3)
         CMN2 = -march=pentium3
         SUNCC_CFLAGS += -xarch=sse
 endif
-ifeq ($(MACHINE),pentium4)
+ifeq ($(PROCESSOR),pentium4)
         CMN2 = -march=pentium4
         SUNCC_CFLAGS += -xarch=sse2
 endif
-ifeq ($(MACHINE),core)
+ifeq ($(PROCESSOR),core)
         CMN2 = -march=prescott
         SUNCC_CFLAGS += -xarch=sse3

kernel/arch/sparc64/Makefile.inc

@@ -43 +43 @@
 DEFS += -D__64_BITS__
 
-ifeq ($(MACHINE),us)
+ifeq ($(PROCESSOR),us)
         DEFS += -DUS
 endif
 
-ifeq ($(MACHINE),us3)
+ifeq ($(PROCESSOR),us3)
         DEFS += -DUS3
 endif