Merge branch 'devel' of ssh://palacios@newskysaw/home/palacios/palacios into devel

[palacios.git] / palacios / src / devices / Kconfig

diff --git a/palacios/src/devices/Kconfig b/palacios/src/devices/Kconfig
index 63fe5ed..b449d34 100644 (file)
--- a/palacios/src/devices/Kconfig
+++ b/palacios/src/devices/Kconfig
@@ -3,7 +3,7 @@ menu "Virtual Devices"
 config APIC
        bool "APIC" 
        default y
-       depends on ICC_BUS
+       depends on EXPERIMENTAL
        help 
          Includes the Virtual APIC device
 
@@ -19,7 +19,7 @@ config DEBUG_APIC
 
 config IO_APIC
        bool "IOAPIC"
-       depends on ICC_BUS
+       depends on EXPERIMENTAL
        default y
        help 
          Includes the Virtual IO APIC
@@ -32,12 +32,6 @@ config DEBUG_IO_APIC
          Enable debugging for the IO APIC
 
 
-config ICC_BUS
-       bool "ICC BUS"
-       default y
-       help 
-         The ICC Bus for APIC/IOAPIC communication
-
 
 config BOCHS_DEBUG
        bool "Bochs Debug Console Device"
@@ -161,7 +155,7 @@ config DEBUG_VIRTIO_NET
 config VNET_NIC
         bool "Enable VNET VIrtio NIC Device"
         default n
-       depends on PCI && EXPERIMENTAL
+       depends on PCI && EXPERIMENTAL && VNET
         help
           Enable the VNET Virtio backend device
 
@@ -264,6 +258,18 @@ config DEBUG_PIT
        help 
          Enable debugging for the PIT  
 
+config FILEDISK
+       bool "FILEDISK storage backend"
+       default y
+       depends on FILE && (IDE || LINUX_VIRTIO_BLOCK)
+       help
+         Includes the file based disk backend
+
+config DEBUG_FILEDISK
+       bool "FILEDISK backend debugging"
+       depends on FILEDISK && DEBUG_ON
+       help 
+         Enable debugging for the file based disk backend      
 
 config NETDISK
        bool "NETDISK storage backend"
@@ -279,6 +285,11 @@ config RAMDISK
        help 
          Includes the RAM based disk backend
 
+config DEBUG_RAMDISK
+       bool "RAMDISK baskend debugging"
+       depends on RAMDISK && DEBUG_ON
+       help 
+         Enable debugging for the ram based disk backend       
 
 config TMPDISK
        bool "TMPDISK storage backend"
@@ -330,5 +341,17 @@ config CURSES_CONSOLE
        help
          Includes the virtual curses console 
 
+config SERIAL_UART
+       bool "Serial Port"
+       default y
+       help 
+         Include virtual serial port
+
+config CHAR_STREAM
+       bool "Stream based character frontend"
+       default n
+       help
+         Include Stream based character device frontend
+
 endmenu