ArmVirtualizationPkg/PciHostBridgeDxe: accommodate general address spaces

[mirror_edk2.git] / ArmPlatformPkg / ArmVirtualizationPkg / ArmVirtualizationQemu.dsc

diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
index abf419f355a656611bb66c7fccb7360ff23bb76f..29d07788dcd40304003c870b882b784e3f88a941 100644 (file)
--- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
+++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc
@@ -42,12 +42,21 @@
   # Virtio Support\r
   VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf\r
   VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf\r
+  QemuFwCfgLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/QemuFwCfgLib/QemuFwCfgLib.inf\r
 \r
   ArmPlatformLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPlatformLib/ArmVirtualizationPlatformLib.inf\r
   ArmPlatformSysConfigLib|ArmPlatformPkg/Library/ArmPlatformSysConfigLibNull/ArmPlatformSysConfigLibNull.inf\r
 \r
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf\r
 \r
+!ifdef INTEL_BDS\r
+  CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf\r
+  GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf\r
+  PlatformBdsLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf\r
+  CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf\r
+  QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf\r
+!endif\r
+\r
 [LibraryClasses.common.UEFI_DRIVER]\r
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
 \r
@@ -60,7 +69,7 @@
 [BuildOptions]\r
   RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A15 -I$(WORKSPACE)/ArmPlatformPkg/ArmVirtualizationPkg/Include\r
   GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/ArmPlatformPkg/ArmVirtualizationPkg/Include\r
-  GCC:*_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmPlatformPkg/ArmVirtualizationPkg/Include\r
+  *_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmPlatformPkg/ArmVirtualizationPkg/Include\r
 \r
 \r
 ################################################################################\r
@@ -70,6 +79,9 @@
 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r
+  gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderPciTranslation|FALSE\r
+  gUefiOvmfPkgTokenSpaceGuid.PcdQemuBootOrderMmioTranslation|TRUE\r
+\r
   ## If TRUE, Graphics Output Protocol will be installed on virtual handle created by ConsplitterDxe.\r
   #  It could be set FALSE to save size.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|FALSE\r
@@ -119,9 +131,9 @@
   gArmPlatformTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
 \r
   #\r
-  # ARM Virtual Architectural Timer\r
+  # ARM Virtual Architectural Timer -- fetch frequency from QEMU (TCG) or KVM\r
   #\r
-  gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|100000000\r
+  gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0\r
 \r
   #\r
   # NV Storage PCDs. Use base of 0x04000000 for NOR1\r
@@ -139,7 +151,16 @@
   # initial location of the device tree blob passed by QEMU -- base of DRAM\r
   gArmVirtualizationTokenSpaceGuid.PcdDeviceTreeInitialBaseAddress|0x40000000\r
 \r
+!ifdef INTEL_BDS\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }\r
+!endif\r
+\r
 [PcdsDynamicDefault.common]\r
+  ## If TRUE, OvmfPkg/AcpiPlatformDxe will not wait for PCI\r
+  #  enumeration to complete before installing ACPI tables.\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdPciDisableBusEnumeration|TRUE\r
+\r
   # System Memory Size -- 1 MB initially, actual size will be fetched from DT\r
   gArmTokenSpaceGuid.PcdSystemMemorySize|0x00100000\r
 \r
@@ -160,7 +181,21 @@
   ## PL031 RealTimeClock\r
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0\r
 \r
-  gArmTokenSpaceGuid.PcdArmPsciMethod|0\r
+  gArmPlatformTokenSpaceGuid.PcdPciBusMin|0x0\r
+  gArmPlatformTokenSpaceGuid.PcdPciBusMax|0x0\r
+  gArmPlatformTokenSpaceGuid.PcdPciIoBase|0x0\r
+  gArmPlatformTokenSpaceGuid.PcdPciIoSize|0x0\r
+  gArmPlatformTokenSpaceGuid.PcdPciIoTranslation|0x0\r
+  gArmPlatformTokenSpaceGuid.PcdPciMmio32Base|0x0\r
+  gArmPlatformTokenSpaceGuid.PcdPciMmio32Size|0x0\r
+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0x0\r
+\r
+  gArmVirtualizationTokenSpaceGuid.PcdArmPsciMethod|0\r
+\r
+  gArmVirtualizationTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0\r
+  gArmVirtualizationTokenSpaceGuid.PcdFwCfgDataAddress|0x0\r
+\r
+  gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
 \r
 ################################################################################\r
 #\r
@@ -245,10 +280,22 @@
   # Bds\r
   #\r
   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
+!ifdef INTEL_BDS\r
+  MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
+  MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
+  IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf\r
+!else\r
   ArmPlatformPkg/Bds/Bds.inf\r
+!endif\r
 \r
   #\r
   # SCSI Bus and Disk Driver\r
   #\r
   MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf\r
   MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf\r
+\r
+  #\r
+  # ACPI Support\r
+  #\r
+  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
+  OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf\r