BeagleBoardPkg: remove dependency on ArmPkg/BaseMemoryLibStm

[mirror_edk2.git] / ArmPkg / ArmPkg.dsc

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index 6959fde22c12f3570d9f25b548eb8935da31107a..6a8ff7e621d76a8474ad16832a382a805f7cdc13 100644 (file)
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -63,9 +63,11 @@
   UncachedMemoryAllocationLib|ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf\r
   DxeServicesTableLib|MdePkg/Library/DxeServicesTableLib/DxeServicesTableLib.inf\r
   DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf\r
+  CpuExceptionHandlerLib|ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf\r
 \r
   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf\r
   ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf\r
+  ArmGicArchLib|ArmPkg/Library/ArmGicArchLib/ArmGicArchLib.inf\r
   ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf\r
   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf\r
   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf\r
@@ -78,13 +80,14 @@
   BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf\r
   FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf\r
 \r
-  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
+  ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf\r
+  FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf\r
+  SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf\r
 \r
-[LibraryClasses.ARM]\r
-  ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r
+  IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
 \r
-[LibraryClasses.AARCH64]\r
-  ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf\r
+  ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf\r
+  ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf\r
 \r
 [LibraryClasses.common.PEIM]\r
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf\r
@@ -93,9 +96,6 @@
   PeiServicesLib|MdePkg/Library/PeiServicesLib/PeiServicesLib.inf\r
   PeiServicesTablePointerLib|MdePkg/Library/PeiServicesTablePointerLib/PeiServicesTablePointerLib.inf\r
 \r
-[LibraryClasses.common.DXE_DRIVER]\r
-  ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Dxe/DxeArmPlatformGlobalVariableLib.inf\r
-\r
 [LibraryClasses.ARM, LibraryClasses.AARCH64]\r
   NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
 \r
@@ -106,7 +106,6 @@
   ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf\r
   ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf\r
   ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf\r
-  ArmPkg/Library/ArmLib/Null/NullArmLib.inf\r
   ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf\r
   ArmPkg/Library/BdsLib/BdsLib.inf\r
   ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf\r
@@ -120,6 +119,8 @@
   ArmPkg/Library/SemihostLib/SemihostLib.inf\r
   ArmPkg/Library/UncachedMemoryAllocationLib/UncachedMemoryAllocationLib.inf\r
   ArmPkg/Library/ArmPsciResetSystemLib/ArmPsciResetSystemLib.inf\r
+  ArmPkg/Library/ArmExceptionLib/ArmExceptionLib.inf\r
+  ArmPkg/Library/ArmExceptionLib/ArmRelocateExceptionLib.inf\r
 \r
   ArmPkg/Drivers/CpuDxe/CpuDxe.inf\r
   ArmPkg/Drivers/CpuPei/CpuPei.inf\r
@@ -138,27 +139,15 @@
 \r
   ArmPkg/Filesystem/SemihostFs/SemihostFs.inf\r
 \r
-  ArmPkg/Application/LinuxLoader/LinuxFdtLoader.inf\r
+  ArmPkg/Application/LinuxLoader/LinuxLoader.inf\r
 \r
-[Components.ARM]\r
-  ArmPkg/Library/BaseMemoryLibVstm/BaseMemoryLibVstm.inf\r
+  ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf\r
 \r
+[Components.ARM]\r
   ArmPkg/Drivers/ArmCpuLib/ArmCortexA8Lib/ArmCortexA8Lib.inf\r
   ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.inf\r
   ArmPkg/Drivers/ArmCpuLib/ArmCortexA15Lib/ArmCortexA15Lib.inf\r
 \r
-#  ArmPkg/Library/ArmLib/Arm11/Arm11ArmLib.inf\r
-#  ArmPkg/Library/ArmLib/Arm11/Arm11ArmLibPrePi.inf\r
-#  ArmPkg/Library/ArmLib/Arm9/Arm9ArmLib.inf\r
-#  ArmPkg/Library/ArmLib/Arm9/Arm9ArmLibPrePi.inf\r
-  ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf\r
-  ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf\r
-\r
-  ArmPkg/Application/LinuxLoader/LinuxAtagLoader.inf\r
-\r
 [Components.AARCH64]\r
   ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.inf\r
   ArmPkg/Drivers/ArmCpuLib/ArmCortexA5xLib/ArmCortexA5xLib.inf\r
-\r
-  ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf\r
-  ArmPkg/Library/ArmLib/AArch64/AArch64LibPrePi.inf\r