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

diff --git a/ArmPkg/Include/Chipset/AArch64.h b/ArmPkg/Include/Chipset/AArch64.h
index 8b64786004324ae3e15054ead352b3933539e7fd..e0115885092c9b3f5ca5e906d966adcd67ee6829 100644 (file)
--- a/ArmPkg/Include/Chipset/AArch64.h
+++ b/ArmPkg/Include/Chipset/AArch64.h
@@ -86,24 +86,6 @@ ArmWriteTpidrurw (
   UINTN Value\r
   );\r
 \r
-UINTN\r
-EFIAPI\r
-ArmIsArchTimerImplemented (\r
-  VOID\r
-  );\r
-\r
-UINTN\r
-EFIAPI\r
-ArmReadIdPfr0 (\r
-  VOID\r
-  );\r
-\r
-UINTN\r
-EFIAPI\r
-ArmReadIdPfr1 (\r
-  VOID\r
-  );\r
-\r
 UINTN\r
 EFIAPI\r
 ArmGetTCR (\r

diff --git a/ArmPkg/Include/Chipset/ArmV7.h b/ArmPkg/Include/Chipset/ArmV7.h
index 29922eca19fcc7e9b28e3c23c50cfa1cff1c9129..3fcc4264fccf66a9fd1f98d346e86f0b6dcb8ec7 100644 (file)
--- a/ArmPkg/Include/Chipset/ArmV7.h
+++ b/ArmPkg/Include/Chipset/ArmV7.h
@@ -101,18 +101,6 @@ ArmWriteTpidrurw (
   UINTN Value\r
   );\r
 \r
-UINTN\r
-EFIAPI\r
-ArmIsArchTimerImplemented (\r
-  VOID\r
-  );\r
-\r
-UINTN\r
-EFIAPI\r
-ArmReadIdPfr1 (\r
-  VOID\r
-  );\r
-\r
 UINT32\r
 EFIAPI\r
 ArmReadNsacr (\r

diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index bd1bbc40b406d7ae41254b432ad57154fb07f808..611622e1a8e72bba47fe921f63bf8e6cb6d647a2 100644 (file)
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -193,7 +193,25 @@ EFIAPI
 ArmInstructionCacheLineLength (\r
   VOID\r
   );\r
-  \r
+\r
+UINTN\r
+EFIAPI\r
+ArmIsArchTimerImplemented (\r
+  VOID\r
+  );\r
+\r
+UINTN\r
+EFIAPI\r
+ArmReadIdPfr0 (\r
+  VOID\r
+  );\r
+\r
+UINTN\r
+EFIAPI\r
+ArmReadIdPfr1 (\r
+  VOID\r
+  );\r
+\r
 UINT32\r
 EFIAPI\r
 Cp15IdCode (\r

diff --git a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c
index 970bde34cdcd9dfa55d312a043148d0515a890c8..4373e8c2e74c8c5172b0ab00287e7fb54f2521dc 100644 (file)
--- a/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c
+++ b/ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   Generic ARM implementation of TimerLib.h\r
 \r
-  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\r
+  Copyright (c) 2011-2013, 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
@@ -15,12 +15,12 @@
 \r
 \r
 #include <Base.h>\r
+#include <Library/ArmLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/TimerLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/ArmArchTimerLib.h>\r
-#include <Chipset/ArmV7.h>\r
 \r
 #define TICKS_PER_MICRO_SEC     (PcdGet32 (PcdArmArchTimerFreqInHz)/1000000U)\r
 \r