X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=Kconfig;h=726a7b6f35c26424fb2d3c29d15ba5c39f5a49c3;hb=262c92c9f620f87500f350b4744d2f31b6de7da5;hp=a9cc6acbd9469bf2a1ef722d667dc0812d094fd3;hpb=ee1279646a778613b23a42350b903ebb57c068f8;p=palacios.git

diff --git a/Kconfig b/Kconfig
index a9cc6ac..726a7b6 100644
--- a/Kconfig
+++ b/Kconfig
@@ -148,9 +148,8 @@ config SYMBIOTIC
 	bool "Enable Symbiotic Functionality"
 	default n
 	help 
-	  Enable Symbiotic components of the VMM
-
-
+	  Enable Symbiotic components of the VMM. 
+	  This includes the SymSpy interface.
 
 config SYMCALL
 	bool "Symbiotic upcalls"
@@ -159,27 +158,34 @@ config SYMCALL
 	help
 	  Enables the Symbiotic upcall interface
 
-config SYMMOD
+config SWAPBYPASS
+	bool "SwapBypass"
+	default n
+	depends on SYMBIOTIC && SYMCALL && EXPERIMENTAL
+	help 
+	  This enables the SwapBypass architecture
+
+config SWAPBYPASS_TELEMETRY
+	bool "Enable SwapBypass Telemetry"
+	default n
+	depends on TELEMETRY && SWAPBYPASS
+	help 
+	  Enable the telemetry information for the SwapBypass subsystem
+
+menuconfig SYMMOD 
 	bool "Symbiotic Modules"
 	default n
-	depends on SYMBIOTIC && EXPERIMENTAL
+	depends on EXPERIMENTAL
+#	depends on SYMBIOTIC
 	help
 	  Enable Symbiotic module loading
 
+if SYMMOD
 
-config SYMBIOTIC_SWAP
-	bool "Symbiotic Swap"
-	default n
-	depends on SYMBIOTIC && SYMCALL && EXPERIMENTAL
-	help 
-	  This enables the symbiotic swap architecture
+source "modules/Kconfig"
+
+endif
 
-config SYMBIOTIC_SWAP_TELEMETRY
-	bool "Enable Symbiotic Swap Telemetry"
-	default n
-	depends on TELEMETRY && SYMBIOTIC_SWAP
-	help 
-	  Enable the telemetry information for the symbiotic swap subsystem
 
 
 endmenu