ArmPkg/ArmLib: introduce ArmBaseLib

Introduce a new ArmLib version ArmBaseLib, which encapsulates the ARM
version ArmV7Lib and the AArch64 version AArch64Lib.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index e26ca035f55572efb1cf6f6c7dfe6ed6334ab3b4..012c5c835f4e6d4981301d8b298ecb790f9c423e 100644 (file)
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -86,6 +86,7 @@
 \r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
 \r
 \r
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf\r
 \r

+  ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf\r

   ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf\r
 \r
 [LibraryClasses.ARM]\r
   ArmMmuLib|ArmPkg/Library/ArmMmuLib/ArmMmuBaseLib.inf\r
 \r
 [LibraryClasses.ARM]\r

diff --git a/ArmPkg/Library/ArmLib/ArmBaseLib.inf b/ArmPkg/Library/ArmLib/ArmBaseLib.inf
new file mode 100644 (file)
index 0000000..3e9f19c
--- /dev/null
+++ b/ArmPkg/Library/ArmLib/ArmBaseLib.inf
@@ -0,0 +1,59 @@
+#/** @file\r
+#\r
+# Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>\r
+# 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
+#\r
+#\r
+#**/\r
+\r
+[Defines]\r
+  INF_VERSION                    = 0x00010005\r
+  BASE_NAME                      = ArmBaseLib\r
+  FILE_GUID                      = f1d943b6-99c5-46d5-af5a-66ec67662700\r
+  MODULE_TYPE                    = BASE\r
+  VERSION_STRING                 = 1.0\r
+  LIBRARY_CLASS                  = ArmLib\r
+\r
+[Sources]\r
+  Common/ArmLib.c\r
+\r
+[Sources.ARM]\r
+  ArmV7/ArmV7Lib.c\r
+  ArmV7/ArmV7ArchTimer.c\r
+\r
+  ArmV7/ArmLibSupportV7.S         | GCC\r
+  ArmV7/ArmV7Support.S            | GCC\r
+  ArmV7/ArmV7ArchTimerSupport.S   | GCC\r
+  Common/Arm/ArmLibSupport.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
+\r
+[Sources.AARCH64]\r
+  AArch64/AArch64Lib.c\r
+  AArch64/AArch64ArchTimer.c\r
+\r
+  AArch64/ArmLibSupportV8.S\r
+  AArch64/AArch64Support.S\r
+  AArch64/AArch64ArchTimerSupport.S\r
+  Common/AArch64/ArmLibSupport.S\r
+\r
+[Packages]\r
+  ArmPkg/ArmPkg.dec\r
+  MdePkg/MdePkg.dec\r
+\r
+[Protocols]\r
+  gEfiCpuArchProtocolGuid\r
+\r
+[FeaturePcd.ARM]\r
+  gArmTokenSpaceGuid.PcdNormalMemoryNonshareableOverride\r