Make bare-metal a kernel selection.

 /trunk/config/kernel.in |   22    14     8     0 ++++++++++++++--------
 /trunk/config/target.in |   13     0    13     0 -------------
 2 files changed, 14 insertions(+), 21 deletions(-)

2 files changed, 14 insertions, 21 deletions

diff --git a/config/kernel.in b/config/kernel.in
index f46a937..db7b802 100644
--- a/config/kernel.in
+++ b/config/kernel.in
@@ -1,15 +1,11 @@
 # Kernel options
 
-
-
 config KERNEL
     string
     default "none"  if BARE_METAL
     default "linux" if KERNEL_LINUX
 
-if ! BARE_METAL
-
-menu "Kernel"
+menu "Target OS"
 
 choice
     bool
@@ -18,10 +14,22 @@ choice
 
 config KERNEL_LINUX
     bool
-    prompt "linux"
+    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
+
 endchoice
 
 config KERNEL_VERSION
@@ -32,5 +40,3 @@ source config/kernel/linux.in
 endif
 
 endmenu
-
-endif # ! BARE_METAL
diff --git a/config/target.in b/config/target.in
index bd7b725..b5c7af1 100644
--- a/config/target.in
+++ b/config/target.in
@@ -28,19 +28,6 @@ config TARGET_LDFLAGS
 
 comment "General target options"
 
-config BARE_METAL
-    bool
-    prompt "Bare metal (EXPERIMENTAL)"
-    default n
-    depends on EXPERIMENTAL
-    help
-      Say 'y' here if you want a simple C compiler with no C library.
-
-      You probably want to say 'y' here if you plan to use your compiler
-      to build only kernels or bootloaders
-
-      'Bare metal' also refer to those programs that run without any kernel.
-
 choice
     bool
     prompt "Target architecture:"