Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision c247262e870426717fb30c3998c3a9eeed2d71b1)
+++ HelenOS.config	(revision a1d51670ee1c36385f1b4bf1b245ab50b09f761e)
@@ -28,9 +28,4 @@
 #
 
-## Configuration options
-
-% Assume sane defaults where sensible?
-! DEFAULTS (y/n)
-
 ## General platform options
 
@@ -72,9 +67,5 @@
 @ "athlon_xp" Athlon XP
 @ "athlon_mp" Athlon MP
-! [DEFAULTS=n&PLATFORM=ia32] PROCESSOR (choice)
-
-% CPU type
-@ "pentium4" Pentium 4
-! [DEFAULTS=y&PLATFORM=ia32] PROCESSOR (choice)
+! [PLATFORM=ia32] PROCESSOR (choice)
 
 % CPU type
@@ -232,5 +223,5 @@
 @ "icc_native" ICC Native
 @ "suncc_native" Sun Studio C Compiler
-! [DEFAULTS=n&(PLATFORM=amd64|PLATFORM=ia32)] COMPILER (choice)
+! [PLATFORM=amd64|PLATFORM=ia32] COMPILER (choice)
 
 % Compiler
@@ -238,5 +229,5 @@
 @ "gcc_native" GCC Native
 @ "icc_native" ICC Native
-! [DEFAULTS=n&PLATFORM=ia64] COMPILER (choice)
+! [PLATFORM=ia64] COMPILER (choice)
 
 % Compiler
@@ -244,26 +235,18 @@
 @ "gcc_native" GCC Native
 @ "suncc_native" Sun Studio C Compiler
-! [DEFAULTS=n&PLATFORM=sparc64] COMPILER (choice)
+! [PLATFORM=sparc64] COMPILER (choice)
 
 % Compiler
 @ "gcc_cross" GCC Cross-compiler
 @ "gcc_native" GCC Native
-! [DEFAULTS=n&(PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32)] COMPILER (choice)
-
-% Compiler
-@ "gcc_cross" GCC Cross-compiler
-! [DEFAULTS=y] COMPILER (choice)
+! [PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] COMPILER (choice)
 
 ## Debug build options
 
 % Debug build
-! [DEFAULTS=n]CONFIG_DEBUG (y/n)
-% Debug build
-! [DEFAULTS=y]CONFIG_DEBUG (y)
+! CONFIG_DEBUG (y/n)
 
 % 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)
+! [CONFIG_DEBUG=y&CONFIG_SMP=y] CONFIG_DEBUG_SPINLOCK (y/n)
 
 ## Kernel configuration
@@ -315,52 +298,34 @@
 
 % Improved support for hyperthreading
-! [DEFAULTS=n&PLATFORM=amd64&CONFIG_SMP=y] CONFIG_HT (y/n)
+! [PLATFORM=amd64&CONFIG_SMP=y] CONFIG_HT (y/n)
 % Improved support for hyperthreading
-! [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)
+! [PLATFORM=ia32&PROCESSOR!=athlon_xp&PROCESSOR!=athlon_mp&PROCESSOR!=pentium3&CONFIG_SMP=y] CONFIG_HT (y/n)
 
 % Lazy FPU context switching
-! [DEFAULTS=n&CONFIG_FPU=y] CONFIG_FPU_LAZY (y/n)
-% Lazy FPU context switching
-! [DEFAULTS=y&CONFIG_FPU=y] CONFIG_FPU_LAZY (y)
+! [CONFIG_FPU=y] CONFIG_FPU_LAZY (y/n)
 
 % Use VHPT
-! [DEFAULTS=n&PLATFORM=ia64] CONFIG_VHPT (n/y)
+! [PLATFORM=ia64] CONFIG_VHPT (n/y)
 
 % Use TSB
-! [DEFAULTS=n&PLATFORM=sparc64] CONFIG_TSB (y/n)
-% Use TSB
-! [DEFAULTS=y&PLATFORM=sparc64] CONFIG_TSB (y)
+! [PLATFORM=sparc64] CONFIG_TSB (y/n)
 
 % 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)
+! [PLATFORM=ia64&MACHINE!=ski] CONFIG_IOSAPIC (y/n)
 
 % 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)
+! [PLATFORM=sparc64] CONFIG_VIRT_IDX_DCACHE (y/n)
 
 % Support for userspace debuggers
-! [DEFAULTS=n] CONFIG_UDEBUG (y/n)
-% Support for userspace debuggers
-! [DEFAULTS=y] CONFIG_UDEBUG (y)
+! CONFIG_UDEBUG (y/n)
 
 % Kernel console support
-! [DEFAULTS=n] CONFIG_KCONSOLE (y/n)
-% Kernel console support
-! [DEFAULTS=y] CONFIG_KCONSOLE (y)
+! CONFIG_KCONSOLE (y/n)
 
 % Detailed kernel logging
-! [DEFAULTS=n] CONFIG_LOG (n/y)
+! CONFIG_LOG (n/y)
 
 % Compile kernel tests
-! [DEFAULTS=n] CONFIG_TEST (y/n)
-% Compile kernel tests
-! [DEFAULTS=y] CONFIG_TEST (y)
+! CONFIG_TEST (y/n)
 
 ## Hardware support
@@ -421,9 +386,5 @@
 @ "1600"
 @ "2048"
-! [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)
+! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_FB=y] CONFIG_VESA_WIDTH (choice)
 
 % Framebuffer height
@@ -438,9 +399,5 @@
 @ "1200"
 @ "1536"
-! [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)
+! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_FB=y] CONFIG_VESA_HEIGHT (choice)
 
 % Framebuffer depth
@@ -448,19 +405,11 @@
 @ "16"
 @ "24"
-! [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)
+! [(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_FB=y] CONFIG_VESA_BPP (choice)
 
 % Start AP processors by the loader
-! [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)
+! [PLATFORM=sparc64&CONFIG_SMP=y] CONFIG_AP (y/n)
 
 % Use Block Address Translation by the loader
-! [DEFAULTS=n&PLATFORM=ppc32] CONFIG_BAT (y/n)
-% Use Block Address Translation by the loader
-! [DEFAULTS=y&PLATFORM=ppc32] CONFIG_BAT (y)
+! [PLATFORM=ppc32] CONFIG_BAT (y/n)
 
 % Preserve A.OUT header in isofs.b
@@ -473,6 +422,3 @@
 @ "us_qwerty" US QWERTY
 @ "us_dvorak" US Dvorak
-! [DEFAULTS=n&CONFIG_HID_IN=keyboard] KBD_LAYOUT (choice)
-% Keyboard layout
-@ "us_qwerty" US QWERTY
-! [DEFAULTS=y&CONFIG_HID_IN=keyboard] KBD_LAYOUT (choice)
+! [CONFIG_HID_IN=keyboard] KBD_LAYOUT (choice)