MdePkg/BaseMemoryLib: widen aligned accesses to 32 or 64 bits

[mirror_edk2.git] / ArmPkg / ArmPkg.dsc

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index df5be6e21f3313e2044a85e29ed3f2f435ec5379..6a8ff7e621d76a8474ad16832a382a805f7cdc13 100644 (file)
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -86,11 +86,8 @@
 \r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
 \r
-[LibraryClasses.ARM]\r
-  ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.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
@@ -109,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
@@ -145,19 +141,13 @@
 \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/ArmV7/ArmV7LibSec.inf\r
-  ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.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