UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / ArmPlatformPkg / ArmPlatformPkg.dsc

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc b/ArmPlatformPkg/ArmPlatformPkg.dsc
index b19fa98be0bae620964dff1e192555bcb0297276..ddd128f9e606cecadc31694908802206f352924e 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg.dsc
+++ b/ArmPlatformPkg/ArmPlatformPkg.dsc
@@ -2,7 +2,7 @@
 # ARM platform package.\r
 #\r
 # Copyright (c) 2009 - 2010, Apple Inc. All rights reserved.<BR>\r
-# Copyright (c) 2011 - 2018, ARM Ltd. All rights reserved.<BR>\r
+# Copyright (c) 2011 - 2020, Arm Limited. All rights reserved.<BR>\r
 # Copyright (c) 2016 - 2017, Linaro Ltd. All rights reserved.<BR>\r
 # Copyright (c) Microsoft Corporation.<BR>\r
 #\r
@@ -26,13 +26,15 @@
   SKUID_IDENTIFIER               = DEFAULT\r
 \r
 [BuildOptions]\r
-  RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG\r
-  *_*_*_CC_FLAGS  = -DDISABLE_NEW_DEPRECATED_INTERFACES\r
+  RELEASE_*_*_CC_FLAGS  = -D MDEPKG_NDEBUG\r
+  *_*_*_CC_FLAGS  = -D DISABLE_NEW_DEPRECATED_INTERFACES\r
 \r
 [PcdsFixedAtBuild]\r
   gArmTokenSpaceGuid.PcdFdBaseAddress|0x0\r
   gArmTokenSpaceGuid.PcdFdSize|0x1000\r
 \r
+!include MdePkg/MdeLibs.dsc.inc\r
+\r
 [LibraryClasses.common]\r
   ArmGicArchLib|ArmPkg/Library/ArmGicArchSecLib/ArmGicArchSecLib.inf\r
   ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf\r
@@ -53,15 +55,17 @@
   LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf\r
   MemoryInitPeiLib|ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf\r
-  NorFlashPlatformLib|ArmPlatformPkg/Library/NorFlashPlatformNullLib/NorFlashPlatformNullLib.inf\r
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf\r
   PeCoffLib|MdePkg/Library/BasePeCoffLib/BasePeCoffLib.inf\r
   PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf\r
+  PL011UartClockLib|ArmPlatformPkg/Library/PL011UartClockLib/PL011UartClockLib.inf\r
+  PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf\r
   PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf\r
   PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf\r
   PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf\r
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf\r
+  TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf\r
   TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf\r
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf\r
   UefiDecompressLib|MdePkg/Library/BaseUefiDecompressLib/BaseUefiDecompressLib.inf\r
@@ -87,11 +91,15 @@
   MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf\r
   PrePiHobListPointerLib|ArmPlatformPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf\r
 \r
+[LibraryClasses.AARCH64.MM_STANDALONE]\r
+  HobLib|StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf\r
+  MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemoryAllocationLib.inf\r
+  MmServicesTableLib|MdePkg/Library/StandaloneMmServicesTableLib/StandaloneMmServicesTableLib.inf\r
+  StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf\r
+\r
 [Components.common]\r
   ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.inf\r
-  ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
   ArmPlatformPkg/Drivers/PL061GpioDxe/PL061GpioDxe.inf\r
-  ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf\r
   ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf\r
 \r
   ArmPlatformPkg/Library/ArmPlatformLibNull/ArmPlatformLibNull.inf\r
@@ -99,7 +107,6 @@
   ArmPlatformPkg/Library/HdLcd/HdLcd.inf\r
   ArmPlatformPkg/Library/LcdHwNullLib/LcdHwNullLib.inf\r
   ArmPlatformPkg/Library/LcdPlatformNullLib/LcdPlatformNullLib.inf\r
-  ArmPlatformPkg/Library/NorFlashPlatformNullLib/NorFlashPlatformNullLib.inf\r
   ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf\r
   ArmPlatformPkg/Library/PL011UartClockLib/PL011UartClockLib.inf\r
   ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf\r