OvmfPkg: Modify QemuFwCfgLib to use new IoLib class library

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32.dsc

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 874fa906a6b1ca0df0d49a54ce7d51b541c0677a..e97f7f0262d9e163ea5ffe729952df97189a1d4a 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -26,7 +26,7 @@
   DSC_SPECIFICATION              = 0x00010005\r
   OUTPUT_DIRECTORY               = Build/OvmfIa32\r
   SUPPORTED_ARCHITECTURES        = IA32\r
-  BUILD_TARGETS                  = DEBUG|RELEASE\r
+  BUILD_TARGETS                  = NOOPT|DEBUG|RELEASE\r
   SKUID_IDENTIFIER               = DEFAULT\r
   FLASH_DEFINITION               = OvmfPkg/OvmfPkgIa32.fdf\r
 \r
@@ -46,9 +46,21 @@
   MSFT:RELEASE_*_*_CC_FLAGS            = /D MDEPKG_NDEBUG\r
   GCC:*_*_*_CC_FLAGS                   = -mno-mmx -mno-sse\r
 \r
+  #\r
+  # Disable deprecated APIs.\r
+  #\r
+  MSFT:*_*_*_CC_FLAGS = /D DISABLE_NEW_DEPRECATED_INTERFACES\r
+  INTEL:*_*_*_CC_FLAGS = /D DISABLE_NEW_DEPRECATED_INTERFACES\r
+  GCC:*_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES\r
+\r
 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
 \r
+# Force PE/COFF sections to be aligned at 4KB boundaries to support page level\r
+# protection of DXE_SMM_DRIVER/SMM_CORE modules\r
+[BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]\r
+  GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
+\r
 ################################################################################\r
 #\r
 # SKU Identification section - list of all SKU IDs supported by this Platform.\r
@@ -476,6 +488,10 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|FALSE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPropertiesTableEnable|FALSE\r
 \r
+  # UefiCpuPkg PCDs related to initial AP bringup and general AP management.\r
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber|64\r
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuApInitTimeOutInMicroSeconds|50000\r
+\r
 ################################################################################\r
 #\r
 # Components Section - list of all EDK II Modules needed by this Platform.\r
@@ -489,7 +505,7 @@
   #\r
   OvmfPkg/Sec/SecMain.inf {\r
     <LibraryClasses>\r
-      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
+      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
   }\r
 \r
   #\r
@@ -534,7 +550,7 @@
   #\r
   MdeModulePkg/Core/Dxe/DxeMain.inf {\r
     <LibraryClasses>\r
-      NULL|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
+      NULL|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
       DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf\r
   }\r
 \r
@@ -634,10 +650,7 @@
   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
   MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf\r
 \r
-  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf {\r
-    <LibraryClasses>\r
-      BltLib|OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf\r
-  }\r
+  OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf\r
   OvmfPkg/VirtioGpuDxe/VirtioGpu.inf\r
 \r
   #\r
@@ -666,6 +679,7 @@
   OvmfPkg/AcpiTables/AcpiTables.inf\r
   MdeModulePkg/Universal/Acpi/S3SaveStateDxe/S3SaveStateDxe.inf\r
   MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf\r
+  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
 \r
   #\r
   # Network Support\r