OvmfPkg: BDS: drop custom boot timeout, revert to IntelFrameworkModulePkg's

[mirror_edk2.git] / OvmfPkg / OvmfPkgX64.dsc

diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index fedd0a72d67683aa4d8bd07bcd2322c140f0db9c..225b0e67841f0ddea2eff58041321b4d50d16ca4 100644 (file)
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -128,6 +128,7 @@
 \r
   S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf\r
   SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf\r
+  OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf\r
 \r
 [LibraryClasses.common]\r
 !if $(SECURE_BOOT_ENABLE) == TRUE\r
@@ -335,6 +336,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoHorizontalResolution|800\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdVideoVerticalResolution|600\r
 \r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|0\r
 \r
 ################################################################################\r
 #\r
@@ -432,6 +434,8 @@
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
   OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FvbServicesRuntimeDxe.inf\r
+  OvmfPkg/XenBusDxe/XenBusDxe.inf\r
+  OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
   OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.inf {\r
     <LibraryClasses>\r
       PlatformFvbLib|OvmfPkg/Library/EmuVariableFvbLib/EmuVariableFvbLib.inf\r
@@ -566,7 +570,7 @@
       BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf\r
       OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf\r
   }\r
-  OvmfPkg/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
+  SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf\r
 !endif\r
 \r
   OvmfPkg/PlatformDxe/Platform.inf\r