x86/tboot: adjust Kconfig default

We shouldn't include unsupported code by default, with not even a means
for its building to be disabled. Convert the dependency from merely
affecting the prompt's visibility to a real one.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Daniel P. Smith <dpsmith@apertussolutions.com>

diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
index 8e70f9a44847e9b8832bcb5e576e0ff1134c3ea8..83d0f317ecf93d5154278328591b00fe37835c27 100644 (file)
--- a/xen/arch/x86/Kconfig
+++ b/xen/arch/x86/Kconfig
@@ -193,14 +193,15 @@ config HVM_FEP
          If unsure, say N.
 
 config TBOOT
-       bool "Xen tboot support (UNSUPPORTED)" if UNSUPPORTED
-       default y if !PV_SHIM_EXCLUSIVE
+       bool "Xen tboot support (UNSUPPORTED)"
+       depends on UNSUPPORTED
+       default !PV_SHIM_EXCLUSIVE
        select CRYPTO
        ---help---
          Allows support for Trusted Boot using the Intel(R) Trusted Execution
          Technology (TXT)
 
-         If unsure, say Y.
+         If unsure, stay with the default.
 
 choice
        prompt "Alignment of Xen image"