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

4 files changed, 6 insertions, 139 deletions

diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf
index dca0b22dde..06824e5e75 100644
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.inf
@@ -1,7 +1,7 @@
 #/** @file

 #

 # Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>

-# Portions copyright (c) 2011-2013, ARM Limited. All rights reserved.

+# Portions copyright (c) 2011 - 2014, ARM Limited. All rights reserved.

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -26,10 +26,12 @@
   AArch64Mmu.c

   AArch64ArchTimer.c

   ArmLibSupportV8.S                   | GCC

-  ../Common/AArch64/ArmLibSupport.S   | GCC

   AArch64Support.S                    | GCC

   AArch64ArchTimerSupport.S           | GCC

 

+  ../Common/AArch64/ArmLibSupport.S   | GCC

+  ../Common/ArmLib.c

+

 [Packages]

   ArmPkg/ArmPkg.dec

   MdePkg/MdePkg.dec

diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf b/ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf
index 9bb0bd21d0..c273718b33 100644
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64LibSec.inf
@@ -1,6 +1,6 @@
 #/* @file

 #

-#  Copyright (c) 2011-2013, ARM Limited. All rights reserved.

+#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -23,9 +23,9 @@
 [Sources.common]

   ArmLibSupportV8.S                   | GCC

   AArch64Support.S                    | GCC

-  ArmLib.c

 

   ../Common/AArch64/ArmLibSupport.S   | GCC

+  ../Common/ArmLib.c

 

   AArch64Lib.c

 

diff --git a/ArmPkg/Library/ArmLib/AArch64/ArmLib.c b/ArmPkg/Library/ArmLib/AArch64/ArmLib.c
deleted file mode 100644
index fa95d352dc..0000000000
--- a/ArmPkg/Library/ArmLib/AArch64/ArmLib.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/** @file

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-  portions copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>

-

-  This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-**/

-

-#include <Base.h>

-

-#include <Library/ArmLib.h>

-#include <Library/DebugLib.h>

-#include <Library/PcdLib.h>

-

-#include "ArmLibPrivate.h"

-

-VOID

-EFIAPI

-ArmCacheInformation (

-  OUT ARM_CACHE_INFO  *CacheInfo

-  )

-{

-  if (CacheInfo != NULL) {

-    CacheInfo->Type                           = ArmCacheType();

-    CacheInfo->Architecture                   = ArmCacheArchitecture();

-    CacheInfo->DataCachePresent               = ArmDataCachePresent();

-    CacheInfo->DataCacheSize                  = ArmDataCacheSize();

-    CacheInfo->DataCacheAssociativity         = ArmDataCacheAssociativity();

-    CacheInfo->DataCacheLineLength            = ArmDataCacheLineLength();

-    CacheInfo->InstructionCachePresent        = ArmInstructionCachePresent();

-    CacheInfo->InstructionCacheSize           = ArmInstructionCacheSize();

-    CacheInfo->InstructionCacheAssociativity  = ArmInstructionCacheAssociativity();

-    CacheInfo->InstructionCacheLineLength     = ArmInstructionCacheLineLength();

-  }

-}

-

-VOID

-EFIAPI

-ArmSetAuxCrBit (

-  IN  UINT32    Bits

-  )

-{

-  UINT32 val = ArmReadAuxCr();

-  val |= Bits;

-  ArmWriteAuxCr(val);

-}

diff --git a/ArmPkg/Library/ArmLib/AArch64/ArmLibPrivate.h b/ArmPkg/Library/ArmLib/AArch64/ArmLibPrivate.h
deleted file mode 100644
index d2804fc102..0000000000
--- a/ArmPkg/Library/ArmLib/AArch64/ArmLibPrivate.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/** @file

-

-  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>

-  Copyright (c) 2011 - 2013, ARM Ltd. All rights reserved.<BR>

-

-  This program and the accompanying materials

-  are licensed and made available under the terms and conditions of the BSD License

-  which accompanies this distribution.  The full text of the license may be found at

-  http://opensource.org/licenses/bsd-license.php

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-

-**/

-

-#ifndef __ARM_LIB_PRIVATE_H__

-#define __ARM_LIB_PRIVATE_H__

-

-#define CACHE_SIZE_4_KB             (3UL)

-#define CACHE_SIZE_8_KB             (4UL)

-#define CACHE_SIZE_16_KB            (5UL)

-#define CACHE_SIZE_32_KB            (6UL)

-#define CACHE_SIZE_64_KB            (7UL)

-#define CACHE_SIZE_128_KB           (8UL)

-

-#define CACHE_ASSOCIATIVITY_DIRECT  (0UL)

-#define CACHE_ASSOCIATIVITY_4_WAY   (2UL)

-#define CACHE_ASSOCIATIVITY_8_WAY   (3UL)

-

-#define CACHE_PRESENT               (0UL)

-#define CACHE_NOT_PRESENT           (1UL)

-

-#define CACHE_LINE_LENGTH_32_BYTES  (2UL)

-

-#define SIZE_FIELD_TO_CACHE_SIZE(x)           (((x) >> 6) & 0x0F)

-#define SIZE_FIELD_TO_CACHE_ASSOCIATIVITY(x)  (((x) >> 3) & 0x07)

-#define SIZE_FIELD_TO_CACHE_PRESENCE(x)       (((x) >> 2) & 0x01)

-#define SIZE_FIELD_TO_CACHE_LINE_LENGTH(x)    (((x) >> 0) & 0x03)

-

-#define DATA_CACHE_SIZE_FIELD(x)              (((x) >> 12) & 0x0FFF)

-#define INSTRUCTION_CACHE_SIZE_FIELD(x)       (((x) >>  0) & 0x0FFF)

-

-#define DATA_CACHE_SIZE(x)                    (SIZE_FIELD_TO_CACHE_SIZE(DATA_CACHE_SIZE_FIELD(x)))

-#define DATA_CACHE_ASSOCIATIVITY(x)           (SIZE_FIELD_TO_CACHE_ASSOCIATIVITY(DATA_CACHE_SIZE_FIELD(x)))

-#define DATA_CACHE_PRESENT(x)                 (SIZE_FIELD_TO_CACHE_PRESENCE(DATA_CACHE_SIZE_FIELD(x)))

-#define DATA_CACHE_LINE_LENGTH(x)             (SIZE_FIELD_TO_CACHE_LINE_LENGTH(DATA_CACHE_SIZE_FIELD(x)))

-

-#define INSTRUCTION_CACHE_SIZE(x)             (SIZE_FIELD_TO_CACHE_SIZE(INSTRUCTION_CACHE_SIZE_FIELD(x)))

-#define INSTRUCTION_CACHE_ASSOCIATIVITY(x)    (SIZE_FIELD_TO_CACHE_ASSOCIATIVITY(INSTRUCTION_CACHE_SIZE_FIELD(x)))

-#define INSTRUCTION_CACHE_PRESENT(x)          (SIZE_FIELD_TO_CACHE_PRESENCE(INSTRUCTION_CACHE_SIZE_FIELD(x)))

-#define INSTRUCTION_CACHE_LINE_LENGTH(x)      (SIZE_FIELD_TO_CACHE_LINE_LENGTH(INSTRUCTION_CACHE_SIZE_FIELD(x)))

-

-#define CACHE_TYPE(x)                         (((x) >> 25) & 0x0F)

-#define CACHE_TYPE_WRITE_BACK                 (0x0EUL)

-

-#define CACHE_ARCHITECTURE(x)                 (((x) >> 24) & 0x01)

-#define CACHE_ARCHITECTURE_UNIFIED            (0UL)

-#define CACHE_ARCHITECTURE_SEPARATE           (1UL)

-

-

-VOID

-CPSRMaskInsert (

-  IN  UINT32  Mask,

-  IN  UINT32  Value

-  );

-

-UINT32

-CPSRRead (

-  VOID

-  );

-

-UINT32

-ReadCCSIDR (

-  IN UINT32 CSSELR

-  );

-

-UINT32

-ReadCLIDR (

-  VOID

-  );

-

-#endif // __ARM_LIB_PRIVATE_H__