OvmfPkg: simplify SecurityStubDxe.inf inclusion

SecurityStubDxe.inf should be included unconditionally.

Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index fbe0f790e431d58e2deb8dc92ce5d9fda14ad0f5..5bd3f4f977df08ac3c7953eaed9ef5761737d9d8 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -611,14 +611,12 @@
 \r
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
 \r
 \r
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
 \r

-!if $(SECURE_BOOT_ENABLE) == TRUE\r

   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {\r
     <LibraryClasses>\r
   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {\r
     <LibraryClasses>\r

+!if $(SECURE_BOOT_ENABLE) == TRUE\r

       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf\r
       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf\r

-       }\r
-!else\r
-  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r

 !endif\r
 !endif\r

+  }\r

 \r
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
   PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
 \r
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
   PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r

diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index fb10e0b0f2e4c70c253e6734cde228aab08186aa..7dded86c4940394cc5fa6be5f901cebc20a3ff56 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -620,14 +620,12 @@
 \r
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
 \r
 \r
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
 \r

-!if $(SECURE_BOOT_ENABLE) == TRUE\r

   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {\r
     <LibraryClasses>\r
   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {\r
     <LibraryClasses>\r

+!if $(SECURE_BOOT_ENABLE) == TRUE\r

       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf\r
       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf\r

-       }\r
-!else\r
-  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r

 !endif\r
 !endif\r

+  }\r

 \r
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
   PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
 \r
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
   PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index a31551f5ae24192b0025329cf587b1ee391a22ba..a8e89276c0b216b955c98527141c0f208f8930a6 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -618,14 +618,12 @@
 \r
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
 \r
 \r
   MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf\r
 \r

-!if $(SECURE_BOOT_ENABLE) == TRUE\r

   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {\r
     <LibraryClasses>\r
   MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf {\r
     <LibraryClasses>\r

+!if $(SECURE_BOOT_ENABLE) == TRUE\r

       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf\r
       NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf\r

-       }\r
-!else\r
-  MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf\r

 !endif\r
 !endif\r

+  }\r

 \r
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
   PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r
 \r
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r
   PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf\r