[boot-wrapper PATCH 5/5] Rename `CNTFRQ` -> `COUNTER_FREQ`
From: Mark Rutland <mark.rutland@arm.com>
Date: 2021-08-24 13:53:04
Subsystem:
the rest · Maintainer:
Linus Torvalds
To avoid any confusuion between the CNTFRQ/CNTFRQ_EL0 register and the vallue it will be progrmamed with, rename the `CNTFRQ` constant to `COUNTER_FREQ. In future patches this will allow us to use `CNTFRQ` as a macro for the AArch32 CP15 register encoding. There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland <mark.rutland@arm.com> --- Makefile.am | 4 ++-- arch/aarch32/boot.S | 2 +- arch/aarch64/boot.S | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 3591d23..d0a68df 100644
--- a/Makefile.am
+++ b/Makefile.am@@ -13,12 +13,12 @@ SCRIPT_DIR := $(top_srcdir)/scripts PHYS_OFFSET := $(shell perl -I $(SCRIPT_DIR) $(SCRIPT_DIR)/findmem.pl $(KERNEL_DTB)) UART_BASE := $(shell perl -I $(SCRIPT_DIR) $(SCRIPT_DIR)/findbase.pl $(KERNEL_DTB) 0 'arm,pl011') SYSREGS_BASE := $(shell perl -I $(SCRIPT_DIR) $(SCRIPT_DIR)/findbase.pl $(KERNEL_DTB) 0 'arm,vexpress-sysreg' 2> /dev/null) -CNTFRQ := 24000000 +COUNTER_FREQ := 24000000 CPU_IDS := $(shell perl -I $(SCRIPT_DIR) $(SCRIPT_DIR)/findcpuids.pl $(KERNEL_DTB)) NR_CPUS := $(shell echo $(CPU_IDS) | tr ',' ' ' | wc -w) -DEFINES = -DCNTFRQ=$(CNTFRQ) +DEFINES = -DCOUNTER_FREQ=$(COUNTER_FREQ) DEFINES += -DCPU_IDS=$(CPU_IDS) DEFINES += -DNR_CPUS=$(NR_CPUS) DEFINES += $(if $(SYSREGS_BASE), -DSYSREGS_BASE=$(SYSREGS_BASE), )
diff --git a/arch/aarch32/boot.S b/arch/aarch32/boot.S
index 08bf932..4add338 100644
--- a/arch/aarch32/boot.S
+++ b/arch/aarch32/boot.S@@ -54,7 +54,7 @@ _monitor: mov r0, #(1 << 10 | 1 << 11) @ Enable NS access to CPACR mcr p15, 0, r0, c1, c1, 2 @ NSACR - ldr r0, =CNTFRQ + ldr r0, =COUNTER_FREQ mcr p15, 0, r0, c14, c0, 0 @ CNTFRQ bl gic_secure_init
diff --git a/arch/aarch64/boot.S b/arch/aarch64/boot.S
index 587a25f..bfbb6ec 100644
--- a/arch/aarch64/boot.S
+++ b/arch/aarch64/boot.S@@ -118,7 +118,7 @@ ASM_FUNC(_start) msr ZCR_EL3, x0 // for EL2. 1: - ldr x0, =CNTFRQ + ldr x0, =COUNTER_FREQ msr cntfrq_el0, x0 bl gic_secure_init
--
2.11.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel