merge VNET Linux backend code into Linux module directory

[palacios.git] / Kconfig

diff --git a/Kconfig b/Kconfig
index 6c11bac..28c4b09 100644 (file)
--- a/Kconfig
+++ b/Kconfig
@@ -17,8 +17,8 @@ config KITTEN
        help
          This enables the necesary options to compile Palacios with Kitten
 
-config LINUX
-       bool "Linux 2.6"
+config LINUX_BUILTIN
+       bool "OLD Linux (Built in) -- to be deprecated"
        select BUILT_IN_STDLIB
        select BUILT_IN_ATOI
        select FILE
@@ -26,6 +26,25 @@ config LINUX
          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 LINUX
+       bool "Linux Module"
+       select BUILT_IN_STDLIB
+       select BUILT_IN_STRDUP
+       select BUILT_IN_ATOI
+       select FILE
+       select V3_DECODER
+       help
+         This enables the necessary options to compile Palacios as a Linux module
+ 
+
+config LINUX_KERN
+       depends on LINUX
+       string "Linux Kernel Source directory" 
+       default "/usr/src/linux"
+       help 
+         This is the directory containing the linux source for the kernel module to be built
+
 config MINIX
        bool "MINIX 3"
        help
@@ -69,6 +88,7 @@ choice
 
 config XED
        bool "XED decoder library"
+       depends on !LINUX
        help
           This uses the XED decoder library from pintools 
 
@@ -113,10 +133,19 @@ config FILE
 
 
 config CONSOLE
-       bool "Host Support for VM console"
+       bool "Host Support for VM text-mode console"
        default n
        help 
          Select this if you want to forward a guest console interface to some host OS service
+          This is for a TEXT MODE console.   Select the framebuffer console for graphics and text
+
+config GRAPHICS_CONSOLE
+       bool "Host Support for VM graphics and text-mode console based on a frame buffer"
+       default n
+       help 
+         Select this if you want to forward a guest graphics-mode (and text-mode) console 
+          interface to some host OS service.  This is for a GRAPHICS console based on a shared frame buffer.
+          Text mode output is RENDERED onto the framebuffer
 
 config SOCKET
         bool "Host support for Network Sockets"