UefiCpuPkg/CpuMpPei: Build one GUIDed HOB to save CPU MP Data

[mirror_edk2.git] / ArmPlatformPkg / ArmPlatformPkg-2ndstage.dsc

diff --git a/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc b/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc
index 66a9797a1c0381ed2b005df14142261628354002..76415fec586e7a4d2789faa2c812df111acc6ea4 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc
+++ b/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2015, ARM Limited. All rights reserved.\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -89,6 +89,11 @@
   # Networking Requirements for ArmPlatformPkg/Bds\r
   NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf\r
 \r
+  # These libraries are used by the dynamic EFI Shell commands\r
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf\r
+\r
   # EBL Related Libraries\r
   EblCmdLib|ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf\r
   EfiFileLib|EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf\r
@@ -131,12 +136,14 @@
 \r
   PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf\r
   ExtractGuidedSectionLib|EmbeddedPkg/Library/PrePiExtractGuidedSectionLib/PrePiExtractGuidedSectionLib.inf\r
-  LzmaDecompressLib|IntelFrameworkModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
+  LzmaDecompressLib|MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf\r
   MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf\r
   HobLib|EmbeddedPkg/Library/PrePiHobLib/PrePiHobLib.inf\r
   PrePiHobListPointerLib|ArmPlatformPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf\r
   PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf\r
   PlatformPeiLib|ArmPlatformPkg/PlatformPei/PlatformPeiLib.inf\r
+\r
+[LibraryClasses.common.SEC, LibraryClasses.common.PEIM]\r
   MemoryInitPeiLib|ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf\r
 \r
 [LibraryClasses.common.DXE_CORE]\r
@@ -296,6 +303,11 @@
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20\r
   gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0\r
 \r
+  # We want to use the Shell Libraries but don't want it to initialise\r
+  # automatically. We initialise the libraries when the command is called by the\r
+  # Shell.\r
+  gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE\r
+\r
   #\r
   # ARM Pcds\r
   #\r
@@ -367,3 +379,5 @@
   MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf\r
   ArmPlatformPkg/Bds/Bds.inf\r
 \r
+  # Legacy Linux Loader\r
+  ArmPkg/Application/LinuxLoader/LinuxLoader.inf\r