SecurityPkg: AuthVariableLib: Fix inconsistent CertDB case

[mirror_edk2.git] / ArmVirtPkg / ArmVirtQemuKernel.dsc

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 52f1612179baf5bc9916308fdc5a85e58430e28a..6c536d9bbd2d58efc25fca24a12165c32a307679 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -45,7 +45,12 @@
   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
   # Virtio Support\r
   VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf\r
   VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf\r
@@ -75,6 +80,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
@@ -292,9 +302,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
@@ -310,6 +322,7 @@
   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf\r
   MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf\r
+  MdeModulePkg/Universal/DriverHealthManagerDxe/DriverHealthManagerDxe.inf\r
   MdeModulePkg/Universal/BdsDxe/BdsDxe.inf {\r
     <LibraryClasses>\r
       NULL|MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf\r
@@ -336,15 +349,6 @@
   }\r
   OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
 \r
-  #\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
-  }\r
-\r
   #\r
   # PCI support\r
   #\r
@@ -373,3 +377,13 @@
   MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf\r
   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
+\r
+[Components.AARCH64]\r
+  #\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
+  }\r