BaseTools/tools_def AARCH64: enable frame pointers for DEBUG builds

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemuKernel.dsc

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 6bf894a5702fe57575241c74cbeb9218662c5adb..383d9b7d2c0bcc36d7ba2ca32c8aa35b94659119 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -45,6 +45,9 @@
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r
   ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf\r
 \r
+[LibraryClasses.ARM.SEC]\r
+  ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf\r
+\r
 [LibraryClasses.common]\r
   ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf\r
 \r
@@ -68,6 +71,8 @@
   QemuBootOrderLib|OvmfPkg/Library/QemuBootOrderLib/QemuBootOrderLib.inf\r
   FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.inf\r
   PciPcdProducerLib|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+  PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf\r
+  PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf\r
 \r
 [LibraryClasses.common.UEFI_DRIVER]\r
   UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf\r
@@ -77,6 +82,11 @@
   GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a15 -I$(WORKSPACE)/ArmVirtPkg/Include\r
   *_*_AARCH64_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmVirtPkg/Include\r
 \r
+[BuildOptions.ARM.EDKII.SEC, BuildOptions.ARM.EDKII.BASE]\r
+  # Avoid MOVT/MOVW instruction pairs in code that may end up in the PIE\r
+  # executable we build for the relocatable PrePi. They are not runtime\r
+  # relocatable in ELF.\r
+  *_CLANG35_*_CC_FLAGS = -mno-movt\r
 \r
 ################################################################################\r
 #\r
@@ -93,9 +103,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE\r
 \r
-  # Activate KVM workaround for now.\r
-  gArmVirtTokenSpaceGuid.PcdKludgeMapPciMmioAsCached|TRUE\r
-\r
 [PcdsFixedAtBuild.common]\r
   gArmPlatformTokenSpaceGuid.PcdCoreCount|1\r
 !if $(ARCH) == AARCH64\r
@@ -198,6 +205,8 @@
   # PCD and PcdPciDisableBusEnumeration above have not been assigned yet\r
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xFFFFFFFFFFFFFFFF\r
 \r
+  gArmTokenSpaceGuid.PcdPciIoTranslation|0x0\r
+\r
   #\r
   # Set video resolution for boot options and for text setup.\r
   # PlatformDxe can set the former at runtime.\r
@@ -294,9 +303,11 @@
   #\r
   ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf\r
   ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf\r
+  ArmVirtPkg/HighMemDxe/HighMemDxe.inf\r
   OvmfPkg/VirtioBlkDxe/VirtioBlk.inf\r
   OvmfPkg/VirtioScsiDxe/VirtioScsi.inf\r
   OvmfPkg/VirtioNetDxe/VirtioNet.inf\r
+  OvmfPkg/VirtioRngDxe/VirtioRng.inf\r
 \r
   #\r
   # FAT filesystem + GPT/MBR partitioning\r
@@ -342,7 +353,11 @@
   #\r
   # PCI support\r
   #\r
-  ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
+  ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf {\r
+    <LibraryClasses>\r
+      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
+  }\r
+  MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf\r
   MdeModulePkg/Bus/Pci/PciBusDxe/PciBusDxe.inf {\r
     <LibraryClasses>\r
       NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r
@@ -357,6 +372,7 @@
     <LibraryClasses>\r
       BltLib|OptionRomPkg/Library/FrameBufferBltLib/FrameBufferBltLib.inf\r
   }\r
+  OvmfPkg/VirtioGpuDxe/VirtioGpu.inf\r
   OvmfPkg/PlatformDxe/Platform.inf\r
 \r
   #\r
@@ -372,7 +388,6 @@
   #\r
   # ACPI Support\r
   #\r
-  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
   OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {\r
     <LibraryClasses>\r
       NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf\r