ArmPkg/ArmLib: ASSERT on set/way cache ops being used with MMU on

[mirror_edk2.git] / ArmPkg / Library / ArmLib / ArmBaseLib.inf

diff --git a/ArmPkg/Library/ArmLib/ArmBaseLib.inf b/ArmPkg/Library/ArmLib/ArmBaseLib.inf
index 3e9f19c3cab1a73e8f41c502816390c2398a9c31..f61c71b673d1d122fdb2010ffe12dbd45351da65 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmBaseLib.inf
+++ b/ArmPkg/Library/ArmLib/ArmBaseLib.inf
@@ -4,12 +4,7 @@
 # Portions copyright (c) 2011 - 2014, ARM Limited. All rights reserved.\r
 # Copyright (c) 2016, Linaro Ltd. 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
-#  which accompanies this distribution. The full text of the license may be found at\r
-#  http://opensource.org/licenses/bsd-license.php\r
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 #\r
 #\r
 #**/\r
@@ -23,37 +18,38 @@
   LIBRARY_CLASS                  = ArmLib\r
 \r
 [Sources]\r
-  Common/ArmLib.c\r
+  ArmLibPrivate.h\r
+  ArmLib.c\r
 \r
 [Sources.ARM]\r
-  ArmV7/ArmV7Lib.c\r
-  ArmV7/ArmV7ArchTimer.c\r
+  Arm/ArmV7Lib.h\r
+  Arm/ArmV7Lib.c\r
 \r
-  ArmV7/ArmLibSupportV7.S         | GCC\r
-  ArmV7/ArmV7Support.S            | GCC\r
-  ArmV7/ArmV7ArchTimerSupport.S   | GCC\r
-  Common/Arm/ArmLibSupport.S      | GCC\r
+  Arm/ArmLibSupport.S           | GCC\r
+  Arm/ArmLibSupportV7.S         | GCC\r
+  Arm/ArmV7Support.S            | GCC\r
+  Arm/ArmV7ArchTimerSupport.S   | GCC\r
 \r
-  ArmV7/ArmLibSupportV7.asm       | RVCT\r
-  ArmV7/ArmV7Support.asm          | RVCT\r
-  ArmV7/ArmV7ArchTimerSupport.asm | RVCT\r
-  Common/Arm/ArmLibSupport.asm    | RVCT\r
+  Arm/ArmLibSupport.asm         | RVCT\r
+  Arm/ArmLibSupportV7.asm       | RVCT\r
+  Arm/ArmV7Support.asm          | RVCT\r
+  Arm/ArmV7ArchTimerSupport.asm | RVCT\r
 \r
 [Sources.AARCH64]\r
+  AArch64/AArch64Lib.h\r
   AArch64/AArch64Lib.c\r
-  AArch64/AArch64ArchTimer.c\r
 \r
+  AArch64/ArmLibSupport.S\r
   AArch64/ArmLibSupportV8.S\r
   AArch64/AArch64Support.S\r
   AArch64/AArch64ArchTimerSupport.S\r
-  Common/AArch64/ArmLibSupport.S\r
+\r
+[LibraryClasses]\r
+  DebugLib\r
 \r
 [Packages]\r
   ArmPkg/ArmPkg.dec\r
   MdePkg/MdePkg.dec\r
 \r
-[Protocols]\r
-  gEfiCpuArchProtocolGuid\r
-\r
 [FeaturePcd.ARM]\r
   gArmTokenSpaceGuid.PcdNormalMemoryNonshareableOverride\r