aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Wiklander <jens.wiklander@linaro.org>2018-08-23 09:47:34 +0200
committerJérôme Forissier <jerome.forissier@linaro.org>2018-08-23 11:28:56 +0200
commit6cea5715bc9fb13b6f8903661e0f7f9cf89a9b50 (patch)
treee12f4ade642f611800a2b788c1ee00c1fa4fc695
parentbbd8f31b3eee16e40873c2b3d566d2578c0e7dbd (diff)
core: rename read_idpfr1() to read_id_pfr1()
Renames the assembly macro read_idpfr1() to read_id_pfr1() to use the real register name. Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
-rw-r--r--core/arch/arm/include/arm32_macros.S2
-rw-r--r--core/arch/arm/sm/sm_a32.S2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/arch/arm/include/arm32_macros.S b/core/arch/arm/include/arm32_macros.S
index 9b2cc272..0e87566b 100644
--- a/core/arch/arm/include/arm32_macros.S
+++ b/core/arch/arm/include/arm32_macros.S
@@ -17,7 +17,7 @@
mrc p15, 0, \reg, c0, c0, 5
.endm
- .macro read_idpfr1 reg
+ .macro read_id_pfr1 reg
mrc p15, 0, \reg, c0, c1, 1
.endm
diff --git a/core/arch/arm/sm/sm_a32.S b/core/arch/arm/sm/sm_a32.S
index 60b77d6d..e8038c84 100644
--- a/core/arch/arm/sm/sm_a32.S
+++ b/core/arch/arm/sm/sm_a32.S
@@ -348,7 +348,7 @@ UNWIND( .fnstart)
* the CNTVOFF encoding is UNPREDICTABLE if executed in Monitor
* mode, regardless of the value of SCR.NS.
*/
- read_idpfr1 r2
+ read_id_pfr1 r2
mov r3, r2
ands r3, r3, #IDPFR1_GENTIMER_MASK
beq .no_gentimer