X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2FKconfig;h=d3a41f1cc9a58606339eaf6f2982492dda533aaf;hb=5e16adcc49f8c77319004ada0276ccd301c67dd1;hp=35b85237f0158b0500be70d6393e13dc4e4e033e;hpb=b6d68a6d671dcd403749fcf317482773895b2a0d;p=palacios-OLD.git

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 35b8523..d3a41f1 100644
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -18,6 +18,7 @@ config DEBUG_APIC
 
 config IO_APIC
 	bool "IOAPIC"
+	depends on APIC
 	default y
 	help 
 	  Includes the Virtual IO APIC
@@ -30,6 +31,13 @@ config DEBUG_IO_APIC
 	  Enable debugging for the IO APIC
 
 
+config MPTABLE
+	bool "MPTABLE"
+	default y
+	depends on APIC
+	help 
+	  Includes the MPTABLE to map the APICs and IO-APIC
+
 
 config BOCHS_DEBUG
 	bool "Bochs Debug Console Device"
@@ -148,7 +156,7 @@ config DEBUG_VIRTIO_SYM
 config LINUX_VIRTIO_NET
         bool "Enable Virtio Network Device"
         default n
-	depends on PCI && EXPERIMENTAL
+	depends on PCI && VNET
         help
           Enable the Virtio Net
 
@@ -163,7 +171,7 @@ config DEBUG_VIRTIO_NET
 config LINUX_VIRTIO_VNET
         bool "Enable Virtio VNET interface"
         default n
-        depends on PCI && EXPERIMENTAL && VNET
+        depends on PCI && VNET
         help
           Enable the Virtio VNET interface for Control VM
 
@@ -178,12 +186,12 @@ config DEBUG_LINUX_VIRTIO_VNET
 config VNET_NIC
         bool "Enable VNET Backend Device"
         default n
-	depends on PCI && EXPERIMENTAL && VNET
+	depends on PCI && VNET
         help
           Enable the VNET backend device
 
 config DEBUG_VNET_NIC
-        bool "VNET NIC Device Debugging"
+        bool "VNET Backend Device Debugging"
         default n
         depends on VNET_NIC && DEBUG_ON
         help
@@ -358,7 +366,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 	
@@ -394,7 +402,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
@@ -412,7 +420,6 @@ config DEBUG_VGA
 config CGA
 	bool "CGA"
 	default n
-	depends on !PASSTHROUGH_VIDEO
 	help
 	  Includes the Virtual CGA video support
 
@@ -427,14 +434,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 
 
@@ -446,6 +453,7 @@ config SERIAL_UART
 
 config CHAR_STREAM
 	bool "Stream based character frontend"
+	depends on STREAM
 	default n
 	help
 	  Include Stream based character device frontend