Fixed stupid branch check, added more preconfig error checking

[palacios.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index b9af306..c94fcb0 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -3,12 +3,38 @@ mainmenu "Palacios VMM Configuration"
 menu "Target Configuration"
 
 
+choice
+       prompt "Target Host OS"
+       default KITTEN
+
 config KITTEN
-       bool "Set defaults needed for the Kitten OS"
-       default y
+       bool "Kitten OS"
+       select BUILT_IN_STDLIB
+       select BUILT_IN_STRCASECMP
+       select BUILT_IN_ATOI
+       help
+         This enables the necesary options to compile Palacios with Kitten
+
+config LINUX
+       bool "Linux 2.6"
+       select BUILT_IN_STDLIB
+       select BUILT_IN_ATOI
+       help
+         This enables the necessary options to compile Palacios with Linux 2.6
+          Currently, this is in development, and only 2.6.32 is verified to work
+
+config MINIX
+       bool "MINIX 3"
        help
          This enables the necesary options to compile Palacios with Kitten
 
+config OTHER_OS
+       bool "Other OS"
+       help 
+         Choose this to compile Palacios for a Generic Host OS
+          (Formerly GeekOS)
+
+endchoice
 
 config CRAY_XT
         bool "Red Storm (Cray XT3/XT4)"
@@ -45,6 +71,15 @@ config MAX_CPUS
          For uniprocessor environments, set this to 1
 
 
+config CONSOLE
+       bool "Include Console Support"
+       default n
+       help 
+         Enable console support in Palacios
+
+
+
+
 config SOCKET
        bool "Include Network Socket Support"
        default y
@@ -201,13 +236,6 @@ menuconfig SYMMOD
        help
          Enable Symbiotic module loading
 
-if SYMMOD
-
-source "modules/Kconfig"
-
-endif
-
-
 
 endmenu