From 168d724568ff1525517b1d0b00361419ca564310 Mon Sep 17 00:00:00 2001
From: Olivier Martin <olivier.martin@arm.com>
Date: Thu, 28 Nov 2013 21:37:36 +0000
Subject: [PATCH] ArmPkg: Move definition of ArmIsArchTimerImplemented /
 ArmReadIdPfrN to ArmLib

These functions are not chipset specific.

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@14908 6f19259b-4bc3-4df7-8a09-765794883524
---
 ArmPkg/Include/Chipset/AArch64.h              | 18 -----------------
 ArmPkg/Include/Chipset/ArmV7.h                | 12 -----------
 ArmPkg/Include/Library/ArmLib.h               | 20 ++++++++++++++++++-
 .../Library/ArmArchTimerLib/ArmArchTimerLib.c |  4 ++--
 4 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/ArmPkg/Include/Chipset/AArch64.h b/ArmPkg/Include/Chipset/AArch64.h
index 8b64786004..e011588509 100644
--- a/ArmPkg/Include/Chipset/AArch64.h
+++ b/ArmPkg/Include/Chipset/AArch64.h
@@ -86,24 +86,6 @@ ArmWriteTpidrurw (
   UINTN Value
   );
 
-UINTN
-EFIAPI
-ArmIsArchTimerImplemented (
-  VOID
-  );
-
-UINTN
-EFIAPI
-ArmReadIdPfr0 (
-  VOID
-  );
-
-UINTN
-EFIAPI
-ArmReadIdPfr1 (
-  VOID
-  );
-
 UINTN
 EFIAPI
 ArmGetTCR (
diff --git a/ArmPkg/Include/Chipset/ArmV7.h b/ArmPkg/Include/Chipset/ArmV7.h
index 29922eca19..3fcc4264fc 100644
--- a/ArmPkg/Include/Chipset/ArmV7.h
+++ b/ArmPkg/Include/Chipset/ArmV7.h
@@ -101,18 +101,6 @@ ArmWriteTpidrurw (
   UINTN Value
   );
 
-UINTN
-EFIAPI
-ArmIsArchTimerImplemented (
-  VOID
-  );
-
-UINTN
-EFIAPI
-ArmReadIdPfr1 (
-  VOID
-  );
-
 UINT32
 EFIAPI
 ArmReadNsacr (
diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index bd1bbc40b4..611622e1a8 100644
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -193,7 +193,25 @@ EFIAPI
 ArmInstructionCacheLineLength (
   VOID
   );
-  
+
+UINTN
+EFIAPI
+ArmIsArchTimerImplemented (
+  VOID
+  );
+
+UINTN
+EFIAPI
+ArmReadIdPfr0 (
+  VOID
+  );
+
+UINTN
+EFIAPI
+ArmReadIdPfr1 (
+  VOID
+  );
+
 UINT32
 EFIAPI
 Cp15IdCode (
diff --git a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c
index 970bde34cd..4373e8c2e7 100644
--- a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c
+++ b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c
@@ -1,7 +1,7 @@
 /** @file
   Generic ARM implementation of TimerLib.h
 
-  Copyright (c) 2011-2012, ARM Limited. All rights reserved.
+  Copyright (c) 2011-2013, 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
@@ -15,12 +15,12 @@
 
 
 #include <Base.h>
+#include <Library/ArmLib.h>
 #include <Library/BaseLib.h>
 #include <Library/TimerLib.h>
 #include <Library/DebugLib.h>
 #include <Library/PcdLib.h>
 #include <Library/ArmArchTimerLib.h>
-#include <Chipset/ArmV7.h>
 
 #define TICKS_PER_MICRO_SEC     (PcdGet32 (PcdArmArchTimerFreqInHz)/1000000U)