X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=Kconfig;h=28c4b09687c32853871f860f5d34f426b75c3517;hb=03715266180ca2d9ea6ca4bbd9151d0017cefa49;hp=06f962bfba4df237ba028a7ab69cb01d614849c6;hpb=305267e8eaabf7dffadd86abc323f7d1b231e388;p=palacios-OLD.git

diff --git a/Kconfig b/Kconfig
index 06f962b..28c4b09 100644
--- 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
@@ -63,6 +82,23 @@ config DEBUG_INFO
 	help
 	  Compiles the Palacios library with debugging symbols
 
+choice 
+	prompt "X86 decoder"
+	default XED
+
+config XED
+	bool "XED decoder library"
+	depends on !LINUX
+	help
+	   This uses the XED decoder library from pintools 
+
+config V3_DECODER
+	bool "Internal Palacios decoder"
+	help
+	    This selects the internal V3Vee x86 decoder
+
+
+endchoice
 
 menu "Supported host OS features"
       
@@ -97,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"