ArmVirtPkg/FdtClientDxe: make DT table installation !ACPI dependent

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemu.dsc

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index d4d9c0f67ee80f7ef38187581248e064086e897b..7b266b98b94947c1c3c23c46ea5fd29f93e95316 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -34,7 +34,6 @@
   # -D FLAG=VALUE\r
   #\r
   DEFINE SECURE_BOOT_ENABLE      = FALSE\r
-  DEFINE PURE_ACPI_BOOT_ENABLE   = FALSE\r
 \r
 !include ArmVirtPkg/ArmVirt.dsc.inc\r
 \r
@@ -60,10 +59,10 @@
   NorFlashPlatformLib|ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf\r
 \r
   CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
-  UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf\r
   BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf\r
   PlatformBootManagerLib|ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf\r
   CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf\r
+  FrameBufferBltLib|MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf\r
   QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf\r
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf\r
   PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
@@ -94,10 +93,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE\r
 \r
-!if $(PURE_ACPI_BOOT_ENABLE) == TRUE\r
-  gArmVirtTokenSpaceGuid.PcdPureAcpiBoot|TRUE\r
-!endif\r
-\r
 [PcdsFixedAtBuild.common]\r
   gArmPlatformTokenSpaceGuid.PcdCoreCount|1\r
 !if $(ARCH) == AARCH64\r
@@ -112,11 +107,6 @@
   # Size of the region used by UEFI in permanent memory (Reserved 64MB)\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000\r
 \r
-  #\r
-  # ARM Pcds\r
-  #\r
-  gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000\r
-\r
   ## Trustzone enable (to make the transition from EL3 to EL2 in ArmPlatformPkg/Sec)\r
   gArmTokenSpaceGuid.PcdTrustzoneSupport|FALSE\r
 \r
@@ -157,8 +147,6 @@
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuIoSize|16\r
 \r
 [PcdsFixedAtBuild.AARCH64]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE\r
-\r
   # KVM limits it IPA space to 40 bits (1 TB), so there is no need to\r
   # support anything bigger, even if the host hardware does\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|40\r
@@ -372,10 +360,7 @@
   #\r
   # Video support\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
   OvmfPkg/PlatformDxe/Platform.inf\r
 \r
@@ -392,6 +377,7 @@
   #\r
   # ACPI Support\r
   #\r
+  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
   OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {\r
     <LibraryClasses>\r
       NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r