X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=23a88ff3b28f980e4a5c12487daf2a0a1c313750;hb=a7f18b04b625362bd7696a5e693cbcebc1c540ea;hp=cf45c27754f75dce08d541b989c6f59c1e47fe45;hpb=693d2dbe9d861e7b9144282eb0d24cc98ab9a35e;p=palacios-OLD.git

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index cf45c27..23a88ff 100644
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -153,6 +153,14 @@ config DEBUG_VIRTIO_SYM
 	help 
 	  Enable debugging for the Linux Virtio Symbiotic Device
 
+config LINUX_VIRTIO_CONSOLE
+        bool "Enable Virtio Console Device"
+        default n
+	depends on PCI
+        help
+          Enable the Virtio Console
+
+
 config LINUX_VIRTIO_NET
         bool "Enable Virtio Network Device"
         default n
@@ -366,7 +374,7 @@ config RAMDISK
 	  Includes the RAM based disk backend
 
 config DEBUG_RAMDISK
-	bool "RAMDISK baskend debugging"
+	bool "RAMDISK backend debugging"
 	depends on RAMDISK && DEBUG_ON
 	help 
 	  Enable debugging for the ram based disk backend 	
@@ -402,7 +410,7 @@ config DISK_MODEL
 config VGA
 	bool "VGA"
 	default n
-	depends on !PASSTHROUGH_VIDEO && GRAPHICS_CONSOLE
+	depends GRAPHICS_CONSOLE
 	help
 	  Includes the Virtual VGA video support, and will 
           eventually also include SVGA
@@ -420,7 +428,6 @@ config DEBUG_VGA
 config CGA
 	bool "CGA"
 	default n
-	depends on !PASSTHROUGH_VIDEO
 	help
 	  Includes the Virtual CGA video support
 
@@ -435,14 +442,14 @@ config DEBUG_CGA
 config TELNET_CONSOLE
 	bool "Telnet Virtual Console"
 	default n
-	depends on CGA && !PASSTHROUGH_VIDEO
+	depends on CGA
 	help
 	  Includes the virtual telnet console 
 
 config CURSES_CONSOLE
 	bool "Curses Virtual Console"
 	default n
-	depends on CGA && !PASSTHROUGH_VIDEO
+	depends on CGA && CONSOLE
 	help
 	  Includes the virtual curses console 
 
@@ -452,6 +459,13 @@ config SERIAL_UART
 	help 
 	  Include virtual serial port
 
+config DEBUG_SERIAL
+        bool "Debug Serial Port"
+        default n
+        depends on SERIAL_UART
+        help
+          Debugging virtual serial port
+
 config CHAR_STREAM
 	bool "Stream based character frontend"
 	depends on STREAM
@@ -459,13 +473,5 @@ config CHAR_STREAM
 	help
 	  Include Stream based character device frontend
 
-
-config MCHECK
-	bool "Machine Check architecture"
-	default n
-	depends on EXPERIMENTAL
-	help 
-	  Include Machine Check injection architecture
-
 endmenu