diff -r f347a40db591 -r 5506fbbad59b config/kernel.in
--- a/config/kernel.in	Mon Sep 15 09:43:35 2008 +0000
+++ b/config/kernel.in	Tue Sep 16 17:39:40 2008 +0000
@@ -1,42 +1,19 @@
 # Kernel options
 
+menu "Operating System"
+
 config KERNEL
     string
-    default "none"  if BARE_METAL
-    default "linux" if KERNEL_LINUX
 
-menu "Target OS"
+config KERNEL_VERSION
+    string
 
 choice
     bool
     prompt "Target OS"
-    default KERNEL_LINUX
 
-config KERNEL_LINUX
-    bool
-    prompt "Linux"
-    help
-      Build a toolchain targeting systems running Linux as a kernel.
-
-config BARE_METAL
-    bool
-    prompt "Bare metal (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
-    help
-      Say 'y' here if you want a simple C compiler with no C library.
-      
-      'Bare metal' also refer to those programs that run without any kernel.
-      
-      You probably want to say 'y' here if you plan to use your compiler
-      to build only kernels or bootloaders
+source config.gen/kernel.in
 
 endchoice
 
-config KERNEL_VERSION
-    string
-
-if KERNEL_LINUX
-source config/kernel/linux.in
-endif
-
 endmenu