MdeModulePkg: Enhance the debug message for InstallProtocolInterface

[mirror_edk2.git] / ArmVirtPkg / ArmVirt.dsc.inc

diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index acfb71d3ff6c7f3b9c99e2b8f32b9c27e3e34b82..5bf53763548868cfbd75b068f7538d4816632a16 100644 (file)
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -17,7 +17,7 @@
   DEFINE DEBUG_PRINT_ERROR_LEVEL = 0x8000004F\r
   DEFINE TTY_TERMINAL            = FALSE\r
 \r
-[BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]\r
+[BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
 \r
 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]\r
@@ -105,6 +105,7 @@
 \r
   # ARM PL031 RTC Driver\r
   RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf\r
+  TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf\r
   # ARM PL011 UART Driver\r
   PL011UartLib|ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf\r
   SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf\r
@@ -386,6 +387,11 @@
   #\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeNxMemoryProtectionPolicy|0xC000000000007FD1\r
 \r
+  #\r
+  # Enable the non-executable DXE stack. (This gets set up by DxeIpl)\r
+  #\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|TRUE\r
+\r
 [PcdsFixedAtBuild.ARM]\r
   gEmbeddedTokenSpaceGuid.PcdPrePiCpuMemorySize|40\r
 \r
@@ -438,5 +444,12 @@
   #\r
   # ACPI Support\r
   #\r
-  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
+  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf {\r
+    <LibraryClasses>\r
+      NULL|EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf\r
+  }\r
+\r
+  #\r
+  # EBC support\r
+  #\r
   MdeModulePkg/Universal/EbcDxe/EbcDxe.inf\r