summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Lindholm <leif@nuviainc.com>2020-12-18 13:57:11 +0000
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2020-12-18 15:27:26 +0000
commite2bfd172e4b98308aadac98f7c8203950a245e4b (patch)
tree10c56974ac9563290a0f74bf17d02b04e7b7975d
parentbb56ce816b360dfa87bc0a579434c3bf8d5ecb38 (diff)
downloadedk2-e2bfd172e4b98308aadac98f7c8203950a245e4b.tar.gz
edk2-e2bfd172e4b98308aadac98f7c8203950a245e4b.tar.bz2
edk2-e2bfd172e4b98308aadac98f7c8203950a245e4b.zip
ArmPkg/ArmLib: move ArmReadIdPfr0/1 into private header ArmV7Lib.h
ArmReadIdPfr0 () and ArmReadIdPfr1 () are now used only inside ArmLib. Remove the prototypes from the public header to discourage new id register accessor additions, and direct id register access in general. Move them into local header Arm/ArmV7Lib.h. Cc: Ard Biesheuvel <ard.biesheuvel@arm.com> Signed-off-by: Leif Lindholm <leif@nuviainc.com> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
-rw-r--r--ArmPkg/Include/Library/ArmLib.h12
-rw-r--r--ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h12
2 files changed, 12 insertions, 12 deletions
diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index c2ed72112b..26cb05def0 100644
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -135,18 +135,6 @@ ArmIsArchTimerImplemented (
UINTN
EFIAPI
-ArmReadIdPfr0 (
- VOID
- );
-
-UINTN
-EFIAPI
-ArmReadIdPfr1 (
- VOID
- );
-
-UINTN
-EFIAPI
ArmCacheInfo (
VOID
);
diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h
index 93183e6723..bb7bda0a3a 100644
--- a/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h
+++ b/ArmPkg/Library/ArmLib/Arm/ArmV7Lib.h
@@ -48,5 +48,17 @@ ArmCleanInvalidateDataCacheEntryBySetWay (
IN UINTN SetWayFormat
);
+UINTN
+EFIAPI
+ArmReadIdPfr0 (
+ VOID
+ );
+
+UINTN
+EFIAPI
+ArmReadIdPfr1 (
+ VOID
+ );
+
#endif // __ARM_V7_LIB_H__