ArmPkg: introduce base ArmMmuLib implementation

[mirror_edk2.git] / ArmVirtPkg / ArmVirtXen.dsc

diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
index f356b23bd4a007afffc211d09d06008fa36acda9..a869986ffa0aa7464b17e0112cc8570d7acb3db1 100644 (file)
--- a/ArmVirtPkg/ArmVirtXen.dsc
+++ b/ArmVirtPkg/ArmVirtXen.dsc
@@ -114,9 +114,6 @@
   gArmTokenSpaceGuid.PcdFvBaseAddress|0x0\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
   gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum|0x0\r
   gArmTokenSpaceGuid.PcdArmArchTimerIntrNum|0x0\r
@@ -133,21 +130,6 @@
   ## PL031 RealTimeClock\r
   gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0\r
 \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
-  gArmVirtTokenSpaceGuid.PcdFwCfgSelectorAddress|0x0\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgDataAddress|0x0\r
-  gArmVirtTokenSpaceGuid.PcdFwCfgDmaAddress|0x0\r
-\r
-  gArmVirtTokenSpaceGuid.PcdArmPsciMethod|0\r
-\r
   gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|3\r
 \r
 ################################################################################\r
@@ -204,13 +186,16 @@
   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf\r
 \r
   ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
-  ArmPkg/Drivers/TimerDxe/TimerDxe.inf\r
+  ArmPkg/Drivers/TimerDxe/TimerDxe.inf {\r
+    <LibraryClasses>\r
+      NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf\r
+  }\r
   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
 \r
   #\r
   # Platform Driver\r
   #\r
-  ArmVirtPkg/VirtFdtDxe/VirtFdtDxe.inf\r
+  ArmVirtPkg/XenioFdtDxe/XenioFdtDxe.inf\r
   ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
 \r
   #\r
@@ -231,3 +216,11 @@
 \r
   OvmfPkg/XenBusDxe/XenBusDxe.inf\r
   OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf\r
+\r
+  #\r
+  # ACPI support\r
+  #\r
+!if $(ARCH) == AARCH64\r
+  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
+  ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf\r
+!endif\r