OvmfPkg: fix OvmfTpmSecurityStub.dsc.inc include

TPM support is independent from secure boot support.  Move the TPM
include snipped out of the secure boot !if block.

Fixes: b47575801e19 ("OvmfPkg: move tcg configuration to dsc and fdf include files")
Bugzilla: https://bugzilla.tianocore.org//show_bug.cgi?id=4290
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>

diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
index 03b7a5cc6b642dac60c686de1c2ac9726191c1b4..7326417eab621453e9dca867b349c7c15b2152a3 100644 (file)
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -716,8 +716,8 @@
     <LibraryClasses>\r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf\r
-!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc\r
 !endif\r
+!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc\r
   }\r
 \r
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r

diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
index d5bdcbb9835c07fe055661f3a0fa817fa22594d0..2d53b5c2950d12ca28368191856aa318e12807e2 100644 (file)
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
@@ -705,8 +705,8 @@
     <LibraryClasses>\r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf\r
-!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc\r
 !endif\r
+!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc\r
   }\r
 \r
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 8401d7390005ecf4ce5b7bea88e7b3a4637eb5ed..3f970a79a08affaeddb4f497bb180eca1b038315 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -805,8 +805,8 @@
     <LibraryClasses>\r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf\r
-!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc\r
 !endif\r
+!include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc\r
   }\r
 \r
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r