ArmPkg: Move definition of ArmIsArchTimerImplemented / ArmReadIdPfrN to ArmLib

[mirror_edk2.git] / ArmPkg / Include / Library / ArmLib.h

diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index 8174845c6f2ddec060412713e6777b895d40b0b6..611622e1a8e72bba47fe921f63bf8e6cb6d647a2 100644 (file)
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -18,10 +18,16 @@
 \r
 #include <Uefi/UefiBaseType.h>\r
 \r
-#ifdef ARM_CPU_ARMv6\r
-#include <Chipset/ARM1176JZ-S.h>\r
+#ifdef MDE_CPU_ARM\r
+  #ifdef ARM_CPU_ARMv6\r
+    #include <Chipset/ARM1176JZ-S.h>\r
+  #else\r
+    #include <Chipset/ArmV7.h>\r
+  #endif\r
+#elif defined(MDE_CPU_AARCH64)\r
+  #include <Chipset/AArch64.h>\r
 #else\r
-#include <Chipset/ArmV7.h>\r
+ #error "Unknown chipset."\r
 #endif\r
 \r
 typedef enum {\r
@@ -187,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
@@ -501,6 +525,7 @@ ArmCallWFE (
 VOID\r
 EFIAPI\r
 ArmCallWFI (\r
+\r
   VOID\r
   );\r
 \r
@@ -528,18 +553,6 @@ ArmEnableVFP (
   VOID\r
   );\r
 \r
-UINT32\r
-EFIAPI\r
-ArmReadNsacr (\r
-  VOID\r
-  );\r
-\r
-VOID\r
-EFIAPI\r
-ArmWriteNsacr (\r
-  IN  UINT32   SetWayFormat\r
-  );\r
-\r
 UINT32\r
 EFIAPI\r
 ArmReadScr (\r