ArmPkg/ArmLib: Removed unused AArch64 files

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15382 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf
index dca0b22dde326ccc6eadaff253dab0f5adc02b5f..06824e5e75ae7c7828cd3949190c001520b5de63 100644 (file)
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf
@@ -1,7 +1,7 @@
 #/** @file\r
 #\r
 # Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>\r
-# Portions copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
+# Portions copyright (c) 2011 - 2014, 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
@@ -26,10 +26,12 @@
   AArch64Mmu.c\r
   AArch64ArchTimer.c\r
   ArmLibSupportV8.S                   | GCC\r
-  ../Common/AArch64/ArmLibSupport.S   | GCC\r
   AArch64Support.S                    | GCC\r
   AArch64ArchTimerSupport.S           | GCC\r
 \r
+  ../Common/AArch64/ArmLibSupport.S   | GCC\r
+  ../Common/ArmLib.c\r
+\r
 [Packages]\r
   ArmPkg/ArmPkg.dec\r
   MdePkg/MdePkg.dec\r

diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf b/ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf
index 9bb0bd21d0d7c1d708caf34d2a4551c888598162..c273718b33d433b9ec5b76012d928c71f99038a0 100644 (file)
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf
@@ -1,6 +1,6 @@
 #/* @file\r
 #\r
-#  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2014, 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
@@ -23,9 +23,9 @@
 [Sources.common]\r
   ArmLibSupportV8.S                   | GCC\r
   AArch64Support.S                    | GCC\r
-  ArmLib.c\r
 \r
   ../Common/AArch64/ArmLibSupport.S   | GCC\r
+  ../Common/ArmLib.c\r
 \r
   AArch64Lib.c\r
 \r

diff --git a/ArmPkg/Library/ArmLib/AArch64/ArmLib.c b/ArmPkg/Library/ArmLib/AArch64/ArmLib.c
deleted file mode 100644 (file)
index fa95d35..0000000
--- a/ArmPkg/Library/ArmLib/AArch64/ArmLib.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/** @file\r
-\r
-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
-  portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>\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
-\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
-#include <Base.h>\r
-\r
-#include <Library/ArmLib.h>\r
-#include <Library/DebugLib.h>\r
-#include <Library/PcdLib.h>\r
-\r
-#include "ArmLibPrivate.h"\r
-\r
-VOID\r
-EFIAPI\r
-ArmCacheInformation (\r
-  OUT ARM_CACHE_INFO  *CacheInfo\r
-  )\r
-{\r
-  if (CacheInfo != NULL) {\r
-    CacheInfo->Type                           = ArmCacheType();\r
-    CacheInfo->Architecture                   = ArmCacheArchitecture();\r
-    CacheInfo->DataCachePresent               = ArmDataCachePresent();\r
-    CacheInfo->DataCacheSize                  = ArmDataCacheSize();\r
-    CacheInfo->DataCacheAssociativity         = ArmDataCacheAssociativity();\r
-    CacheInfo->DataCacheLineLength            = ArmDataCacheLineLength();\r
-    CacheInfo->InstructionCachePresent        = ArmInstructionCachePresent();\r
-    CacheInfo->InstructionCacheSize           = ArmInstructionCacheSize();\r
-    CacheInfo->InstructionCacheAssociativity  = ArmInstructionCacheAssociativity();\r
-    CacheInfo->InstructionCacheLineLength     = ArmInstructionCacheLineLength();\r
-  }\r
-}\r
-\r
-VOID\r
-EFIAPI\r
-ArmSetAuxCrBit (\r
-  IN  UINT32    Bits\r
-  )\r
-{\r
-  UINT32 val = ArmReadAuxCr();\r
-  val |= Bits;\r
-  ArmWriteAuxCr(val);\r
-}\r

diff --git a/ArmPkg/Library/ArmLib/AArch64/ArmLibPrivate.h b/ArmPkg/Library/ArmLib/AArch64/ArmLibPrivate.h
deleted file mode 100644 (file)
index d2804fc..0000000
--- a/ArmPkg/Library/ArmLib/AArch64/ArmLibPrivate.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/** @file\r
-\r
-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
-  Copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>\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
-\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
-#ifndef __ARM_LIB_PRIVATE_H__\r
-#define __ARM_LIB_PRIVATE_H__\r
-\r
-#define CACHE_SIZE_4_KB             (3UL)\r
-#define CACHE_SIZE_8_KB             (4UL)\r
-#define CACHE_SIZE_16_KB            (5UL)\r
-#define CACHE_SIZE_32_KB            (6UL)\r
-#define CACHE_SIZE_64_KB            (7UL)\r
-#define CACHE_SIZE_128_KB           (8UL)\r
-\r
-#define CACHE_ASSOCIATIVITY_DIRECT  (0UL)\r
-#define CACHE_ASSOCIATIVITY_4_WAY   (2UL)\r
-#define CACHE_ASSOCIATIVITY_8_WAY   (3UL)\r
-\r
-#define CACHE_PRESENT               (0UL)\r
-#define CACHE_NOT_PRESENT           (1UL)\r
-\r
-#define CACHE_LINE_LENGTH_32_BYTES  (2UL)\r
-\r
-#define SIZE_FIELD_TO_CACHE_SIZE(x)           (((x) >> 6) & 0x0F)\r
-#define SIZE_FIELD_TO_CACHE_ASSOCIATIVITY(x)  (((x) >> 3) & 0x07)\r
-#define SIZE_FIELD_TO_CACHE_PRESENCE(x)       (((x) >> 2) & 0x01)\r
-#define SIZE_FIELD_TO_CACHE_LINE_LENGTH(x)    (((x) >> 0) & 0x03)\r
-\r
-#define DATA_CACHE_SIZE_FIELD(x)              (((x) >> 12) & 0x0FFF)\r
-#define INSTRUCTION_CACHE_SIZE_FIELD(x)       (((x) >>  0) & 0x0FFF)\r
-\r
-#define DATA_CACHE_SIZE(x)                    (SIZE_FIELD_TO_CACHE_SIZE(DATA_CACHE_SIZE_FIELD(x)))\r
-#define DATA_CACHE_ASSOCIATIVITY(x)           (SIZE_FIELD_TO_CACHE_ASSOCIATIVITY(DATA_CACHE_SIZE_FIELD(x)))\r
-#define DATA_CACHE_PRESENT(x)                 (SIZE_FIELD_TO_CACHE_PRESENCE(DATA_CACHE_SIZE_FIELD(x)))\r
-#define DATA_CACHE_LINE_LENGTH(x)             (SIZE_FIELD_TO_CACHE_LINE_LENGTH(DATA_CACHE_SIZE_FIELD(x)))\r
-\r
-#define INSTRUCTION_CACHE_SIZE(x)             (SIZE_FIELD_TO_CACHE_SIZE(INSTRUCTION_CACHE_SIZE_FIELD(x)))\r
-#define INSTRUCTION_CACHE_ASSOCIATIVITY(x)    (SIZE_FIELD_TO_CACHE_ASSOCIATIVITY(INSTRUCTION_CACHE_SIZE_FIELD(x)))\r
-#define INSTRUCTION_CACHE_PRESENT(x)          (SIZE_FIELD_TO_CACHE_PRESENCE(INSTRUCTION_CACHE_SIZE_FIELD(x)))\r
-#define INSTRUCTION_CACHE_LINE_LENGTH(x)      (SIZE_FIELD_TO_CACHE_LINE_LENGTH(INSTRUCTION_CACHE_SIZE_FIELD(x)))\r
-\r
-#define CACHE_TYPE(x)                         (((x) >> 25) & 0x0F)\r
-#define CACHE_TYPE_WRITE_BACK                 (0x0EUL)\r
-\r
-#define CACHE_ARCHITECTURE(x)                 (((x) >> 24) & 0x01)\r
-#define CACHE_ARCHITECTURE_UNIFIED            (0UL)\r
-#define CACHE_ARCHITECTURE_SEPARATE           (1UL)\r
-\r
-\r
-VOID\r
-CPSRMaskInsert (\r
-  IN  UINT32  Mask,\r
-  IN  UINT32  Value\r
-  );\r
-\r
-UINT32\r
-CPSRRead (\r
-  VOID\r
-  );\r
-\r
-UINT32\r
-ReadCCSIDR (\r
-  IN UINT32 CSSELR\r
-  );\r
-\r
-UINT32\r
-ReadCLIDR (\r
-  VOID\r
-  );\r
-\r
-#endif // __ARM_LIB_PRIVATE_H__\r