From: Jan Beulich <jbeulich@suse.com>
Date: Mon, 7 Mar 2022 07:59:46 +0000 (+0100)
Subject: x86/tboot: adjust Kconfig default
X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~859
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a9c8432e2ab666cf1bbefa46ddfc5da1127a98c7;p=xen.git

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 8e70f9a448..83d0f317ec 100644
--- 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"