IntelFrameworkModulePkg AcpiS3SaveDxe: Remove S3Ready() functional code

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemu.dsc

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index fafad7751e6dfa15c0fe7eb40f91adfab0cfc11a..a820b639eccc06b9ef29b54138059a58b4779630 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -34,6 +34,7 @@
   # -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
@@ -99,6 +100,10 @@
   # Activate KVM workaround for now.\r
   gArmVirtTokenSpaceGuid.PcdKludgeMapPciMmioAsCached|TRUE\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
@@ -359,6 +364,7 @@
   ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
   MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf\r
   OvmfPkg/VirtioPciDeviceDxe/VirtioPciDeviceDxe.inf\r
+  OvmfPkg/Virtio10Dxe/Virtio10.inf\r
 \r
   #\r
   # Video support\r
@@ -384,15 +390,3 @@
   #\r
   MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
   OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf\r
-\r
-[Components.ARM]\r
-  #\r
-  # The ARM/Linux kernel has no built in EFI boot stub (yet), so we still need\r
-  # an intermediate OS loader. Add the LinuxLoader UEFI application so we can\r
-  # invoke it from the shell.\r
-  #\r
-  MdeModulePkg/Universal/FvSimpleFileSystemDxe/FvSimpleFileSystemDxe.inf\r
-  ArmPkg/Application/LinuxLoader/LinuxLoader.inf {\r
-    <LibraryClasses>\r
-      BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf\r
-  }\r