Skip to contentSkip to conversation

Convert COUNTER_FREQUENCY to CONFIG_COUNTER_FREQUENCY

PATCH Superseded Peng Fan (OSS) 2 participants 8 messages Apr 13, 2022

Subsystems (9)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v3 cover Convert COUNTER_FREQUENCY to CONFIG_COUNTER_FREQUENCY

From: Peng Fan <[email protected]>

V3:
Add more help info for CONFIG_COUNTER_FREQUENCY
Drop uneeded comments
Pass git bisect build
Rebased

V2:
Drop imx93 which is wrongly included

This patchset is to convert COUNTER_FREQUENCY to CONFIG_COUNTER_FREQUENCY for arm64. arm32 is not included for now, this could be in following up patches if this patchset is accepted.

This patchset touches lots of boards, so please help review.

Peng Fan (6):
xilinx: versal: board: use CONFIG_COUNTER_FREQUENCY
arch: arm: move COUNTER_FREQUENCY from versal to arm
arch: arm: Kconfig: set default COUNTER_FREQUENCY for i.MX
configs: set CONFIG_COUNTER_FREQUENCY
armv8: set cntfrq_el0 if CONFIG_COUNTER_FREQUENCY is valid include/configs: drop COUNTER_FREQUENCY

 arch/arm/Kconfig                              | 13 +++++++++++++
 arch/arm/cpu/armv8/fsl-layerscape/spintable.S |  2 +-
 arch/arm/cpu/armv8/start.S                    |  4 ++--
 arch/arm/mach-versal/Kconfig                  |  6 ------
 board/xilinx/versal/board.c                   |  2 +-
 configs/a3y17lte_defconfig                    |  1 +
 configs/a5y17lte_defconfig                    |  1 +
 configs/a7y17lte_defconfig                    |  1 +
 configs/apalis-imx8_defconfig                 |  1 +
 configs/apalis-imx8x_defconfig                |  1 +
 configs/bubblegum_96_defconfig                |  1 +
 configs/cgtqmx8_defconfig                     |  1 +
 configs/colibri-imx8x_defconfig               |  1 +
 configs/cortina_presidio-asic-base_defconfig  |  1 +
 configs/cortina_presidio-asic-emmc_defconfig  |  1 +
 configs/cortina_presidio-asic-pnand_defconfig |  1 +
 configs/cubieboard7_defconfig                 |  1 +
 configs/deneb_defconfig                       |  1 +
 configs/dragonboard410c_defconfig             |  1 +
 configs/dragonboard820c_defconfig             |  1 +
 configs/espresso7420_defconfig                |  1 +
 configs/evb-px30_defconfig                    |  1 +
 configs/evb-px5_defconfig                     |  1 +
 configs/evb-rk3308_defconfig                  |  1 +
 configs/evb-rk3328_defconfig                  |  1 +
 configs/evb-rk3399_defconfig                  |  1 +
 configs/evb-rk3568_defconfig                  |  1 +
 configs/firefly-px30_defconfig                |  1 +
 configs/firefly-rk3399_defconfig              |  1 +
 configs/hihope_rzg2_defconfig                 |  1 +
 configs/hikey960_defconfig                    |  1 +
 configs/hikey_defconfig                       |  1 +
 configs/imx8qm_mek_defconfig                  |  1 +
 configs/imx8qm_rom7720_a1_4G_defconfig        |  1 +
 configs/imx8qxp_mek_defconfig                 |  1 +
 configs/khadas-edge-captain-rk3399_defconfig  |  1 +
 configs/khadas-edge-rk3399_defconfig          |  1 +
 configs/khadas-edge-v-rk3399_defconfig        |  1 +
 configs/leez-rk3399_defconfig                 |  1 +
 configs/ls1012a2g5rdb_qspi_defconfig          |  1 +
 configs/ls1012a2g5rdb_tfa_defconfig           |  1 +
 configs/ls1043aqds_defconfig                  |  1 +
 configs/ls1043aqds_lpuart_defconfig           |  1 +
 configs/ls1043aqds_nand_defconfig             |  1 +
 configs/ls1043aqds_nor_ddr3_defconfig         |  1 +
 configs/ls1043aqds_qspi_defconfig             |  1 +
 configs/ls1043aqds_sdcard_ifc_defconfig       |  1 +
 configs/ls1043aqds_sdcard_qspi_defconfig      |  1 +
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig  |  1 +
 configs/ls1043aqds_tfa_defconfig              |  1 +
 configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig |  1 +
 configs/ls1046afrwy_tfa_defconfig             |  1 +
 configs/mt8183_pumpkin_defconfig              |  1 +
 configs/mt8512_bm1_emmc_defconfig             |  1 +
 configs/mt8516_pumpkin_defconfig              |  1 +
 configs/mt8518_ap1_emmc_defconfig             |  1 +
 configs/nanopc-t4-rk3399_defconfig            |  1 +
 configs/nanopi-m4-2gb-rk3399_defconfig        |  1 +
 configs/nanopi-m4-rk3399_defconfig            |  1 +
 configs/nanopi-m4b-rk3399_defconfig           |  1 +
 configs/nanopi-neo4-rk3399_defconfig          |  1 +
 configs/nanopi-r2s-rk3328_defconfig           |  1 +
 configs/nanopi-r4s-rk3399_defconfig           |  1 +
 configs/orangepi-rk3399_defconfig             |  1 +
 configs/p2371-2180_defconfig                  |  1 +
 configs/p2771-0000-000_defconfig              |  1 +
 configs/p2771-0000-500_defconfig              |  1 +
 configs/p3450-0000_defconfig                  |  1 +
 configs/r8a77970_eagle_defconfig              |  1 +
 configs/r8a77980_condor_defconfig             |  1 +
 configs/r8a77990_ebisu_defconfig              |  1 +
 configs/r8a77995_draak_defconfig              |  1 +
 configs/r8a779a0_falcon_defconfig             |  1 +
 configs/rcar3_salvator-x_defconfig            |  1 +
 configs/rcar3_ulcb_defconfig                  |  1 +
 configs/roc-cc-rk3328_defconfig               |  1 +
 configs/rock-pi-4-rk3399_defconfig            |  1 +
 configs/rock-pi-4c-rk3399_defconfig           |  1 +
 configs/rock-pi-e-rk3328_defconfig            |  1 +
 configs/rock-pi-n10-rk3399pro_defconfig       |  1 +
 configs/rock64-rk3328_defconfig               |  1 +
 configs/silinux_ek874_defconfig               |  1 +
 configs/socfpga_agilex_atf_defconfig          |  1 +
 configs/socfpga_agilex_defconfig              |  1 +
 configs/socfpga_agilex_vab_defconfig          |  1 +
 configs/starqltechn_defconfig                 |  1 +
 configs/ten64_tfa_defconfig                   |  1 +
 configs/thunderx_88xx_defconfig               |  1 +
 configs/vexpress_aemv8a_juno_defconfig        |  1 +
 configs/vexpress_aemv8a_semi_defconfig        |  1 +
 configs/vexpress_aemv8r_defconfig             |  1 +
 include/configs/apalis-imx8.h                 |  3 ---
 include/configs/apalis-imx8x.h                |  3 ---
 include/configs/capricorn-common.h            |  3 ---
 include/configs/cgtqmx8.h                     |  3 ---
 include/configs/colibri-imx8x.h               |  1 -
 include/configs/condor.h                      |  3 ---
 include/configs/draak.h                       |  3 ---
 include/configs/dragonboard410c.h             |  3 ---
 include/configs/dragonboard820c.h             |  3 ---
 include/configs/eagle.h                       |  3 ---
 include/configs/ebisu.h                       |  3 ---
 include/configs/exynos7420-common.h           |  3 ---
 include/configs/exynos78x0-common.h           |  3 ---
 include/configs/falcon.h                      |  3 ---
 include/configs/hihope-rzg2.h                 |  3 ---
 include/configs/hikey.h                       |  3 ---
 include/configs/hikey960.h                    |  3 ---
 include/configs/imx8qm_mek.h                  |  3 ---
 include/configs/imx8qm_rom7720.h              |  3 ---
 include/configs/imx8qxp_mek.h                 |  3 ---
 include/configs/ls1012a_common.h              |  3 ---
 include/configs/ls1028a_common.h              |  3 ---
 include/configs/ls1043a_common.h              |  3 ---
 include/configs/ls1046a_common.h              |  3 ---
 include/configs/ls2080a_common.h              |  2 --
 include/configs/mt8183.h                      |  1 -
 include/configs/mt8512.h                      |  1 -
 include/configs/mt8516.h                      |  1 -
 include/configs/mt8518.h                      |  1 -
 include/configs/owl-common.h                  |  3 ---
 include/configs/p2371-2180.h                  |  3 ---
 include/configs/p2771-0000.h                  |  3 ---
 include/configs/p3450-0000.h                  |  3 ---
 include/configs/presidio_asic.h               |  3 +--
 include/configs/px30_common.h                 |  1 -
 include/configs/rk3308_common.h               |  1 -
 include/configs/rk3328_common.h               |  1 -
 include/configs/rk3368_common.h               |  1 -
 include/configs/rk3399_common.h               |  1 -
 include/configs/rk3568_common.h               |  1 -
 include/configs/salvator-x.h                  |  3 ---
 include/configs/sdm845.h                      |  3 ---
 include/configs/silinux-ek874.h               |  3 ---
 include/configs/socfpga_soc64_common.h        |  5 -----
 include/configs/ten64.h                       |  1 -
 include/configs/thunderx_88xx.h               |  3 ---
 include/configs/ulcb.h                        |  3 ---
 include/configs/vexpress_aemv8.h              |  3 ---
 139 files changed, 104 insertions(+), 130 deletions(-)
Signature · 1 line
2.35.1
#1 lore raw

PATCH v3 1/6 xilinx: versal: board: use CONFIG_COUNTER_FREQUENCY

From: Peng Fan <[email protected]>

Since versal has CONFIG_COUNTER_FREQUENCY, so use it. And COUNTER_FREQUENCY will be dropped.

---
 board/xilinx/versal/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/xilinx/versal/board.c +1 -1
index 9940f2aeb33..2e2807eee46 100644
@@ -74,7 +74,7 @@ int board_early_init_r(void)
 	 * Program freq register in System counter and
 	 * enable system counter.
 	 */
-	writel(COUNTER_FREQUENCY,
+	writel(CONFIG_COUNTER_FREQUENCY,
 	       &iou_scntr_secure->base_frequency_id_register);
 
 	debug("counter val 0x%x\n",
Signature · 1 line
2.35.1
#2 lore raw

PATCH v3 2/6 arch: arm: move COUNTER_FREQUENCY from versal to arm

In reply to Peng Fan (OSS)

From: Peng Fan <[email protected]>

Make COUNTER_FREQUENCY usable to armv8 and armv7-a, not limited to versal. And update help message.

---
 arch/arm/Kconfig             | 12 ++++++++++++
 arch/arm/mach-versal/Kconfig |  6 ------
 2 files changed, 12 insertions(+), 6 deletions(-)
arch/arm/Kconfig +12 -0
index 6771f14b105..d77186b77b4 100644
@@ -19,6 +19,18 @@ config ARM64_CRC32
 	  not be present on all ARMv8.0, but is always present on ARMv8.1 and
 	  newer.
 
+config COUNTER_FREQUENCY
+	int "Timer clock frequency"
+	depends on ARM64 || CPU_V7A
+	default 0
+	help
+	  For platforms with ARMv8-A and ARMv7-A which features a system
+	  counter, those platforms needs software to program the counter
+	  frequency. Setup time clock frequency for certain platform.
+	  0 means no need to configure the system counter frequency.
+	  For platforms needs the frequency set in U-Boot with a
+	  pre-defined value, should have the macro defined as a non-zero value.
+
 config POSITION_INDEPENDENT
 	bool "Generate position-independent pre-relocation code"
 	depends on ARM64 || CPU_V7A
arch/arm/mach-versal/Kconfig +0 -6
index 0c6ad345ffd..645f06add44 100644
@@ -24,12 +24,6 @@ config SYS_CONFIG_NAME
 config SYS_MALLOC_LEN
 	default 0x2000000
 
-config COUNTER_FREQUENCY
-	int "Timer clock frequency"
-	default 0
-	help
-	  Setup time clock frequency for certain platform
-
 config ZYNQ_SDHCI_MAX_FREQ
 	default 200000000
 
Signature · 1 line
2.35.1
#3 lore raw

PATCH v3 3/6 arch: arm: Kconfig: set default COUNTER_FREQUENCY for i.MX

In reply to Peng Fan (OSS)

From: Peng Fan <[email protected]>

i.MX6UL/ULL/7D/8QM/8QXP all has system counter frequency run at 8MHz, so set default value for them.

---
 arch/arm/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/Kconfig +1 -0
index d77186b77b4..b633cc9c943 100644
@@ -23,6 +23,7 @@ config COUNTER_FREQUENCY
 	int "Timer clock frequency"
 	depends on ARM64 || CPU_V7A
 	default 0
+	default 8000000 if IMX8 || MX7 || MX6UL || MX6ULL
 	help
 	  For platforms with ARMv8-A and ARMv7-A which features a system
 	  counter, those platforms needs software to program the counter
Signature · 1 line
2.35.1
#4 lore raw

PATCH v3 4/6 configs: set CONFIG_COUNTER_FREQUENCY

In reply to Peng Fan (OSS)

From: Peng Fan <[email protected]>

Set CONFIG_COUNTER_FREQUENCY according to COUNTER_FREQUENCY in config header file.

---
 configs/a3y17lte_defconfig                    | 1 +
 configs/a5y17lte_defconfig                    | 1 +
 configs/a7y17lte_defconfig                    | 1 +
 configs/apalis-imx8_defconfig                 | 1 +
 configs/apalis-imx8x_defconfig                | 1 +
 configs/bubblegum_96_defconfig                | 1 +
 configs/cgtqmx8_defconfig                     | 1 +
 configs/colibri-imx8x_defconfig               | 1 +
 configs/cortina_presidio-asic-base_defconfig  | 1 +
 configs/cortina_presidio-asic-emmc_defconfig  | 1 +
 configs/cortina_presidio-asic-pnand_defconfig | 1 +
 configs/cubieboard7_defconfig                 | 1 +
 configs/deneb_defconfig                       | 1 +
 configs/dragonboard410c_defconfig             | 1 +
 configs/dragonboard820c_defconfig             | 1 +
 configs/espresso7420_defconfig                | 1 +
 configs/evb-px30_defconfig                    | 1 +
 configs/evb-px5_defconfig                     | 1 +
 configs/evb-rk3308_defconfig                  | 1 +
 configs/evb-rk3328_defconfig                  | 1 +
 configs/evb-rk3399_defconfig                  | 1 +
 configs/evb-rk3568_defconfig                  | 1 +
 configs/firefly-px30_defconfig                | 1 +
 configs/firefly-rk3399_defconfig              | 1 +
 configs/hihope_rzg2_defconfig                 | 1 +
 configs/hikey960_defconfig                    | 1 +
 configs/hikey_defconfig                       | 1 +
 configs/imx8qm_mek_defconfig                  | 1 +
 configs/imx8qm_rom7720_a1_4G_defconfig        | 1 +
 configs/imx8qxp_mek_defconfig                 | 1 +
 configs/khadas-edge-captain-rk3399_defconfig  | 1 +
 configs/khadas-edge-rk3399_defconfig          | 1 +
 configs/khadas-edge-v-rk3399_defconfig        | 1 +
 configs/leez-rk3399_defconfig                 | 1 +
 configs/ls1012a2g5rdb_qspi_defconfig          | 1 +
 configs/ls1012a2g5rdb_tfa_defconfig           | 1 +
 configs/ls1043aqds_defconfig                  | 1 +
 configs/ls1043aqds_lpuart_defconfig           | 1 +
 configs/ls1043aqds_nand_defconfig             | 1 +
 configs/ls1043aqds_nor_ddr3_defconfig         | 1 +
 configs/ls1043aqds_qspi_defconfig             | 1 +
 configs/ls1043aqds_sdcard_ifc_defconfig       | 1 +
 configs/ls1043aqds_sdcard_qspi_defconfig      | 1 +
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig  | 1 +
 configs/ls1043aqds_tfa_defconfig              | 1 +
 configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig | 1 +
 configs/ls1046afrwy_tfa_defconfig             | 1 +
 configs/mt8183_pumpkin_defconfig              | 1 +
 configs/mt8512_bm1_emmc_defconfig             | 1 +
 configs/mt8516_pumpkin_defconfig              | 1 +
 configs/mt8518_ap1_emmc_defconfig             | 1 +
 configs/nanopc-t4-rk3399_defconfig            | 1 +
 configs/nanopi-m4-2gb-rk3399_defconfig        | 1 +
 configs/nanopi-m4-rk3399_defconfig            | 1 +
 configs/nanopi-m4b-rk3399_defconfig           | 1 +
 configs/nanopi-neo4-rk3399_defconfig          | 1 +
 configs/nanopi-r2s-rk3328_defconfig           | 1 +
 configs/nanopi-r4s-rk3399_defconfig           | 1 +
 configs/orangepi-rk3399_defconfig             | 1 +
 configs/p2371-2180_defconfig                  | 1 +
 configs/p2771-0000-000_defconfig              | 1 +
 configs/p2771-0000-500_defconfig              | 1 +
 configs/p3450-0000_defconfig                  | 1 +
 configs/r8a77970_eagle_defconfig              | 1 +
 configs/r8a77980_condor_defconfig             | 1 +
 configs/r8a77990_ebisu_defconfig              | 1 +
 configs/r8a77995_draak_defconfig              | 1 +
 configs/r8a779a0_falcon_defconfig             | 1 +
 configs/rcar3_salvator-x_defconfig            | 1 +
 configs/rcar3_ulcb_defconfig                  | 1 +
 configs/roc-cc-rk3328_defconfig               | 1 +
 configs/rock-pi-4-rk3399_defconfig            | 1 +
 configs/rock-pi-4c-rk3399_defconfig           | 1 +
 configs/rock-pi-e-rk3328_defconfig            | 1 +
 configs/rock-pi-n10-rk3399pro_defconfig       | 1 +
 configs/rock64-rk3328_defconfig               | 1 +
 configs/silinux_ek874_defconfig               | 1 +
 configs/socfpga_agilex_atf_defconfig          | 1 +
 configs/socfpga_agilex_defconfig              | 1 +
 configs/socfpga_agilex_vab_defconfig          | 1 +
 configs/starqltechn_defconfig                 | 1 +
 configs/ten64_tfa_defconfig                   | 1 +
 configs/thunderx_88xx_defconfig               | 1 +
 configs/vexpress_aemv8a_juno_defconfig        | 1 +
 configs/vexpress_aemv8a_semi_defconfig        | 1 +
 configs/vexpress_aemv8r_defconfig             | 1 +
 86 files changed, 86 insertions(+)
configs/a3y17lte_defconfig +1 -0
index 7ca7ce0daf2..8081168371b 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_SYS_CONFIG_NAME="exynos78x0-common"
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=26000000
 CONFIG_ARCH_EXYNOS=y
 CONFIG_SYS_TEXT_BASE=0x40001000
 CONFIG_ARCH_EXYNOS7=y
configs/a5y17lte_defconfig +1 -0
index 793389eb735..b6d2bb7e8ca 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_SYS_CONFIG_NAME="exynos78x0-common"
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=26000000
 CONFIG_ARCH_EXYNOS=y
 CONFIG_SYS_TEXT_BASE=0x40001000
 CONFIG_ARCH_EXYNOS7=y
configs/a7y17lte_defconfig +1 -0
index eaa448d84d2..5114e6079fc 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_SYS_CONFIG_NAME="exynos78x0-common"
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=26000000
 CONFIG_ARCH_EXYNOS=y
 CONFIG_SYS_TEXT_BASE=0x40001000
 CONFIG_ARCH_EXYNOS7=y
configs/apalis-imx8_defconfig +1 -0
index 19edbbb6978..58c90664e25 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=8000000
 CONFIG_ARCH_IMX8=y
 CONFIG_SYS_TEXT_BASE=0x80020000
 CONFIG_SYS_MALLOC_LEN=0x2800000
configs/apalis-imx8x_defconfig +1 -0
index b67cdece71c..32e614b3f6e 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=8000000
 CONFIG_ARCH_IMX8=y
 CONFIG_SYS_TEXT_BASE=0x80020000
 CONFIG_SYS_MALLOC_LEN=0x2800000
configs/bubblegum_96_defconfig +1 -0
index f4e6abc4110..a21b245c845 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_OWL=y
 CONFIG_SYS_MALLOC_LEN=0x2000000
 CONFIG_ENV_SIZE=0x2000
configs/cgtqmx8_defconfig +1 -0
index 094cb41c038..2a24dca774a 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_SPL_SYS_ICACHE_OFF=y
 CONFIG_SPL_SYS_DCACHE_OFF=y
+CONFIG_COUNTER_FREQUENCY=8000000
 CONFIG_ARCH_IMX8=y
 CONFIG_SYS_TEXT_BASE=0x80020000
 CONFIG_SYS_MALLOC_LEN=0x2400000
configs/colibri-imx8x_defconfig +1 -0
index 80bc27b1881..3b53d0e5a15 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=8000000
 CONFIG_ARCH_IMX8=y
 CONFIG_SYS_TEXT_BASE=0x80020000
 CONFIG_SYS_MALLOC_LEN=0x2800000
configs/cortina_presidio-asic-base_defconfig +1 -0
index f102b75c355..e1adbf1bcee 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 # CONFIG_SYS_ARCH_TIMER is not set
 CONFIG_TARGET_PRESIDIO_ASIC=y
 CONFIG_SYS_TEXT_BASE=0x04000000
configs/cortina_presidio-asic-emmc_defconfig +1 -0
index c22dcef7ec0..4f6e2e7bcaf 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 # CONFIG_SYS_ARCH_TIMER is not set
 CONFIG_TARGET_PRESIDIO_ASIC=y
 CONFIG_SYS_TEXT_BASE=0x04000000
configs/cortina_presidio-asic-pnand_defconfig +1 -0
index a20b99f4bff..2ee440d07ca 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 # CONFIG_SYS_ARCH_TIMER is not set
 CONFIG_TARGET_PRESIDIO_ASIC=y
 CONFIG_SYS_TEXT_BASE=0x04000000
configs/cubieboard7_defconfig +1 -0
index e73d8d8ed76..677bff64b90 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_OWL=y
 CONFIG_SYS_MALLOC_LEN=0x2000000
 CONFIG_DEFAULT_DEVICE_TREE="s700-cubieboard7"
configs/deneb_defconfig +1 -0
index 55034ad5fb5..111e3b27883 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=8000000
 CONFIG_ARCH_IMX8=y
 CONFIG_SYS_TEXT_BASE=0x80020000
 CONFIG_SYS_MALLOC_LEN=0x2800000
configs/dragonboard410c_defconfig +1 -0
index 33cb31c7251..dc136f98612 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=19000000
 CONFIG_ARCH_SNAPDRAGON=y
 CONFIG_SYS_TEXT_BASE=0x8f600000
 CONFIG_SYS_MALLOC_LEN=0x802000
configs/dragonboard820c_defconfig +1 -0
index 4797153968e..3bd22aa34f0 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=19000000
 CONFIG_ARCH_SNAPDRAGON=y
 CONFIG_SYS_TEXT_BASE=0x80080000
 CONFIG_SYS_MALLOC_LEN=0x804000
configs/espresso7420_defconfig +1 -0
index b3d10ecf4d7..09e213fe371 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_SYS_TEXT_BASE=0x43E00000
configs/evb-px30_defconfig +1 -0
index 061d76e86a3..36eaf4e6b95 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
configs/evb-px5_defconfig +1 -0
index 581b8cdfada..1e2b0f03087 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/evb-rk3308_defconfig +1 -0
index 26d124827ed..b4ce8a1a396 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00600000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
configs/evb-rk3328_defconfig +1 -0
index 78fb93bf978..7e0c4c50a61 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/evb-rk3399_defconfig +1 -0
index a18e6225800..a9afb63fdd9 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/evb-rk3568_defconfig +1 -0
index a4720435838..d2af961eafc 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00a00000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/firefly-px30_defconfig +1 -0
index 873b34b792c..01858a65b4c 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
configs/firefly-rk3399_defconfig +1 -0
index 2858c35d104..3803e42f380 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/hihope_rzg2_defconfig +1 -0
index 05dd00a45fd..3e1077389c2 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=16666666
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_TEXT_BASE=0x50000000
configs/hikey960_defconfig +1 -0
index cb03c6f4b00..e0561638b46 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=19000000
 CONFIG_TARGET_HIKEY960=y
 CONFIG_SYS_TEXT_BASE=0x1ac98000
 CONFIG_SYS_MALLOC_LEN=0x801000
configs/hikey_defconfig +1 -0
index 6f929037fdb..2955e6239eb 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=19000000
 CONFIG_SYS_TEXT_BASE=0x35000000
 CONFIG_SYS_MALLOC_LEN=0x801000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
configs/imx8qm_mek_defconfig +1 -0
index 090bd3c85e5..de5121ff174 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=8000000
 CONFIG_ARCH_IMX8=y
 CONFIG_SYS_TEXT_BASE=0x80020000
 CONFIG_SYS_MALLOC_LEN=0x2400000
configs/imx8qm_rom7720_a1_4G_defconfig +1 -0
index fa1968b356b..aa92c37fa35 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=8000000
 CONFIG_ARCH_IMX8=y
 CONFIG_SYS_TEXT_BASE=0x80020000
 CONFIG_SYS_MALLOC_LEN=0x2800000
configs/imx8qxp_mek_defconfig +1 -0
index 36cf67e7e12..e9eec043d49 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=8000000
 CONFIG_ARCH_IMX8=y
 CONFIG_SYS_TEXT_BASE=0x80020000
 CONFIG_SYS_MALLOC_LEN=0x2400000
configs/khadas-edge-captain-rk3399_defconfig +1 -0
index fffdc61e0fc..cddf5228b60 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/khadas-edge-rk3399_defconfig +1 -0
index 2c6f32e27cf..bd52c015fa4 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/khadas-edge-v-rk3399_defconfig +1 -0
index 3f3cf7d2cda..21bf9487a86 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/leez-rk3399_defconfig +1 -0
index e2bb140bb88..2fa8d563ebe 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/ls1012a2g5rdb_qspi_defconfig +1 -0
index ff5cfaca6d7..cb9ad24b122 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 CONFIG_TARGET_LS1012A2G5RDB=y
 CONFIG_SYS_TEXT_BASE=0x40100000
 CONFIG_SYS_MALLOC_LEN=0x500000
configs/ls1012a2g5rdb_tfa_defconfig +1 -0
index c2807c1a7c9..8763e0d7b04 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 CONFIG_TARGET_LS1012A2G5RDB=y
 CONFIG_TFABOOT=y
 CONFIG_SYS_TEXT_BASE=0x82000000
configs/ls1043aqds_defconfig +1 -0
index 24eb2706e27..52f20c3f59a 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 CONFIG_TARGET_LS1043AQDS=y
 CONFIG_SYS_TEXT_BASE=0x60100000
 CONFIG_SYS_MALLOC_LEN=0x120000
configs/ls1043aqds_lpuart_defconfig +1 -0
index 013b776919b..17272180156 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 CONFIG_TARGET_LS1043AQDS=y
 CONFIG_SYS_TEXT_BASE=0x60100000
 CONFIG_SYS_MALLOC_LEN=0x120000
configs/ls1043aqds_nand_defconfig +1 -0
index ee584f8acea..ba3e4a404b5 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 CONFIG_TARGET_LS1043AQDS=y
 CONFIG_SYS_TEXT_BASE=0x82000000
 CONFIG_SYS_MALLOC_LEN=0x102000
configs/ls1043aqds_nor_ddr3_defconfig +1 -0
index fd6a4945c88..6b45850774c 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 CONFIG_TARGET_LS1043AQDS=y
 CONFIG_SYS_TEXT_BASE=0x60100000
 CONFIG_SYS_MALLOC_LEN=0x120000
configs/ls1043aqds_qspi_defconfig +1 -0
index 5d074308337..6da4520edc4 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 CONFIG_TARGET_LS1043AQDS=y
 CONFIG_SYS_TEXT_BASE=0x40100000
 CONFIG_SYS_MALLOC_LEN=0x102000
configs/ls1043aqds_sdcard_ifc_defconfig +1 -0
index 18600402139..5c519df1338 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 CONFIG_TARGET_LS1043AQDS=y
 CONFIG_SYS_TEXT_BASE=0x82000000
 CONFIG_SYS_MALLOC_LEN=0x102000
configs/ls1043aqds_sdcard_qspi_defconfig +1 -0
index e384e4a4245..ee2168903dd 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 CONFIG_TARGET_LS1043AQDS=y
 CONFIG_SYS_TEXT_BASE=0x82000000
 CONFIG_SYS_MALLOC_LEN=0x102000
configs/ls1043aqds_tfa_SECURE_BOOT_defconfig +1 -0
index 8a62239fa64..6f920ef8a88 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 CONFIG_TARGET_LS1043AQDS=y
 CONFIG_TFABOOT=y
 CONFIG_SYS_TEXT_BASE=0x82000000
configs/ls1043aqds_tfa_defconfig +1 -0
index 3ed054fd4ee..e59c93a05e3 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 CONFIG_TARGET_LS1043AQDS=y
 CONFIG_TFABOOT=y
 CONFIG_SYS_TEXT_BASE=0x82000000
configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig +1 -0
index 93d323d3baf..3cbe1b7c10f 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 CONFIG_TARGET_LS1046AFRWY=y
 CONFIG_TFABOOT=y
 CONFIG_SYS_TEXT_BASE=0x82000000
configs/ls1046afrwy_tfa_defconfig +1 -0
index 7cddc0c7d1e..791ee08ea96 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 CONFIG_TARGET_LS1046AFRWY=y
 CONFIG_TFABOOT=y
 CONFIG_SYS_TEXT_BASE=0x82000000
configs/mt8183_pumpkin_defconfig +1 -0
index 42627a2538b..ea7ab5c8096 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=13000000
 CONFIG_POSITION_INDEPENDENT=y
 CONFIG_ARCH_MEDIATEK=y
 CONFIG_SYS_TEXT_BASE=0x4c000000
configs/mt8512_bm1_emmc_defconfig +1 -0
index 546d1dc80d3..7e711b1b469 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=13000000
 CONFIG_POSITION_INDEPENDENT=y
 CONFIG_ARCH_MEDIATEK=y
 CONFIG_SYS_TEXT_BASE=0x44e00000
configs/mt8516_pumpkin_defconfig +1 -0
index 458b4fb0846..52c12609b15 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=13000000
 CONFIG_POSITION_INDEPENDENT=y
 CONFIG_ARCH_MEDIATEK=y
 CONFIG_SYS_TEXT_BASE=0x4C000000
configs/mt8518_ap1_emmc_defconfig +1 -0
index 444da0be93e..a994cd3a2da 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=13000000
 CONFIG_POSITION_INDEPENDENT=y
 CONFIG_ARCH_MEDIATEK=y
 CONFIG_SYS_TEXT_BASE=0x40008000
configs/nanopc-t4-rk3399_defconfig +1 -0
index 164b066b916..31de4bd1a94 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/nanopi-m4-2gb-rk3399_defconfig +1 -0
index d3075e6a4a3..7c8eff869b6 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/nanopi-m4-rk3399_defconfig +1 -0
index 957879b14b8..d500ebe58dc 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/nanopi-m4b-rk3399_defconfig +1 -0
index 805549bf3b3..16e39035e5e 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/nanopi-neo4-rk3399_defconfig +1 -0
index c9d7be19db3..753ba92d0ed 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/nanopi-r2s-rk3328_defconfig +1 -0
index 899b14caa0d..453e54295de 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_SPL_GPIO=y
configs/nanopi-r4s-rk3399_defconfig +1 -0
index 359673fe603..46ba07f4d55 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/orangepi-rk3399_defconfig +1 -0
index 04e1f4e1363..461300fd106 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/p2371-2180_defconfig +1 -0
index 67657b0369c..5977325973e 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=19200000
 CONFIG_SYS_L2CACHE_OFF=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
configs/p2771-0000-000_defconfig +1 -0
index 53d98b11f5d..47be8a1c286 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=19200000
 CONFIG_SYS_L2CACHE_OFF=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
configs/p2771-0000-500_defconfig +1 -0
index 2e3eec0ee13..94866cd7693 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=19200000
 CONFIG_SYS_L2CACHE_OFF=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
configs/p3450-0000_defconfig +1 -0
index 46f4cd01102..ec813dd7a5b 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=19200000
 CONFIG_SYS_L2CACHE_OFF=y
 CONFIG_ARCH_TEGRA=y
 CONFIG_SYS_TEXT_BASE=0x80080000
configs/r8a77970_eagle_defconfig +1 -0
index b3fbe869285..7b050d82457 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=16666666
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_TEXT_BASE=0x50000000
configs/r8a77980_condor_defconfig +1 -0
index 88901ec46c0..c3b6e99ae77 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=16666666
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_TEXT_BASE=0x50000000
configs/r8a77990_ebisu_defconfig +1 -0
index 13422a10be2..fba03a760fc 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=16666666
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_TEXT_BASE=0x50000000
configs/r8a77995_draak_defconfig +1 -0
index 640f303bffd..008254715e2 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=16666666
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_TEXT_BASE=0x50000000
configs/r8a779a0_falcon_defconfig +1 -0
index c3f56e4b1a0..f76b1132a8e 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=16666666
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_TEXT_BASE=0x50000000
configs/rcar3_salvator-x_defconfig +1 -0
index b6b63829fe2..b3c47c308ec 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=16666666
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_MALLOC_LEN=0x4000000
configs/rcar3_ulcb_defconfig +1 -0
index 85a2e48f96e..a7ef4f1c0ee 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=16666666
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_TEXT_BASE=0x50000000
configs/roc-cc-rk3328_defconfig +1 -0
index a60731d5466..5fc4dd77943 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_SPL_GPIO=y
configs/rock-pi-4-rk3399_defconfig +1 -0
index 1099aad5dd4..80d1e63b59c 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/rock-pi-4c-rk3399_defconfig +1 -0
index ae4aec22ab6..bda4b70dbf9 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_NR_DRAM_BANKS=1
configs/rock-pi-e-rk3328_defconfig +1 -0
index 31581630bad..36038d90530 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_SPL_GPIO=y
configs/rock-pi-n10-rk3399pro_defconfig +1 -0
index c205479b1fc..7151da4c191 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_SPL_GPIO=y
configs/rock64-rk3328_defconfig +1 -0
index 6704946c16c..ea61fe738f2 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
 CONFIG_SPL_GPIO=y
configs/silinux_ek874_defconfig +1 -0
index 61c2a739281..099a200539f 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=16666666
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ARCH_RMOBILE=y
 CONFIG_SYS_TEXT_BASE=0x50000000
configs/socfpga_agilex_atf_defconfig +1 -0
index a048595b5a1..bddacad62db 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=400000000
 CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds"
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_TEXT_BASE=0x200000
configs/socfpga_agilex_defconfig +1 -0
index ab18b24531b..4fad9997ba1 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=400000000
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_TEXT_BASE=0x1000
 CONFIG_SYS_MALLOC_LEN=0x500000
configs/socfpga_agilex_vab_defconfig +1 -0
index 2acfd044e27..a991f3d22b5 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=400000000
 CONFIG_SPL_LDSCRIPT="arch/arm/mach-socfpga/u-boot-spl-soc64.lds"
 CONFIG_ARCH_SOCFPGA=y
 CONFIG_SYS_TEXT_BASE=0x200000
configs/starqltechn_defconfig +1 -0
index e3b2f7c2498..608d001b6df 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_SKIP_LOWLEVEL_INIT=y
+CONFIG_COUNTER_FREQUENCY=19000000
 CONFIG_POSITION_INDEPENDENT=y
 CONFIG_ARCH_SNAPDRAGON=y
 CONFIG_DEFAULT_DEVICE_TREE="starqltechn"
configs/ten64_tfa_defconfig +1 -0
index fd38aca040a..f417a8e8c91 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25000000
 CONFIG_TARGET_TEN64=y
 CONFIG_TFABOOT=y
 CONFIG_SYS_TEXT_BASE=0x82000000
configs/thunderx_88xx_defconfig +1 -0
index 9b0966cfe4a..247e25d4a65 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=25165824
 CONFIG_TARGET_THUNDERX_88XX=y
 CONFIG_SYS_TEXT_BASE=0x00500000
 CONFIG_SYS_MALLOC_LEN=0x101000
configs/vexpress_aemv8a_juno_defconfig +1 -0
index 374fa32cbf4..967bc560936 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_VEXPRESS64=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_DEFAULT_DEVICE_TREE="juno-r2"
configs/vexpress_aemv8a_semi_defconfig +1 -0
index eca61764ba4..1a4cbc1cdd0 100644
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 # CONFIG_ARM64_CRC32 is not set
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_VEXPRESS64=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_DEFAULT_DEVICE_TREE="fvp-base-revc"
configs/vexpress_aemv8r_defconfig +1 -0
index 612797e47d5..a1c5d887170 100644
@@ -1,4 +1,5 @@
 CONFIG_ARM=y
+CONFIG_COUNTER_FREQUENCY=24000000
 CONFIG_ARCH_VEXPRESS64=y
 CONFIG_NR_DRAM_BANKS=2
 CONFIG_DEFAULT_DEVICE_TREE="arm_fvp"
Signature · 1 line
2.35.1
#5 lore raw

PATCH v3 5/6 armv8: set cntfrq_el0 if CONFIG_COUNTER_FREQUENCY is valid

In reply to Peng Fan (OSS)

From: Peng Fan <[email protected]>

Since COUNTER_FREQUENCY is obselete, so set cntfrq_el0 if CONFIG_COUNTER_FREQUENCY is valid

---
 arch/arm/cpu/armv8/start.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/cpu/armv8/start.S +2 -2
index 6a6a4f86502..d328e8c08a1 100644
@@ -138,9 +138,9 @@ pie_fixup_done:
 0:
 	msr	daifclr, #0x4			/* Unmask SError interrupts */
 
-#ifdef COUNTER_FREQUENCY
+#if CONFIG_COUNTER_FREQUENCY
 	branch_if_not_highest_el x0, 4f
-	ldr	x0, =COUNTER_FREQUENCY
+	ldr	x0, =CONFIG_COUNTER_FREQUENCY
 	msr	cntfrq_el0, x0			/* Initialize CNTFRQ */
 #endif
 
Signature · 1 line
2.35.1
#6 lore raw

PATCH v3 6/6 include/configs: drop COUNTER_FREQUENCY

In reply to Peng Fan (OSS)

From: Peng Fan <[email protected]>

Since we have CONFIG_COUNTER_FREQUENCY enabled, no need COUNTER_FREQUENCY

---
 arch/arm/cpu/armv8/fsl-layerscape/spintable.S | 2 +-
 include/configs/apalis-imx8.h                 | 3 ---
 include/configs/apalis-imx8x.h                | 3 ---
 include/configs/capricorn-common.h            | 3 ---
 include/configs/cgtqmx8.h                     | 3 ---
 include/configs/colibri-imx8x.h               | 1 -
 include/configs/condor.h                      | 3 ---
 include/configs/draak.h                       | 3 ---
 include/configs/dragonboard410c.h             | 3 ---
 include/configs/dragonboard820c.h             | 3 ---
 include/configs/eagle.h                       | 3 ---
 include/configs/ebisu.h                       | 3 ---
 include/configs/exynos7420-common.h           | 3 ---
 include/configs/exynos78x0-common.h           | 3 ---
 include/configs/falcon.h                      | 3 ---
 include/configs/hihope-rzg2.h                 | 3 ---
 include/configs/hikey.h                       | 3 ---
 include/configs/hikey960.h                    | 3 ---
 include/configs/imx8qm_mek.h                  | 3 ---
 include/configs/imx8qm_rom7720.h              | 3 ---
 include/configs/imx8qxp_mek.h                 | 3 ---
 include/configs/ls1012a_common.h              | 3 ---
 include/configs/ls1028a_common.h              | 3 ---
 include/configs/ls1043a_common.h              | 3 ---
 include/configs/ls1046a_common.h              | 3 ---
 include/configs/ls2080a_common.h              | 2 --
 include/configs/mt8183.h                      | 1 -
 include/configs/mt8512.h                      | 1 -
 include/configs/mt8516.h                      | 1 -
 include/configs/mt8518.h                      | 1 -
 include/configs/owl-common.h                  | 3 ---
 include/configs/p2371-2180.h                  | 3 ---
 include/configs/p2771-0000.h                  | 3 ---
 include/configs/p3450-0000.h                  | 3 ---
 include/configs/presidio_asic.h               | 3 +--
 include/configs/px30_common.h                 | 1 -
 include/configs/rk3308_common.h               | 1 -
 include/configs/rk3328_common.h               | 1 -
 include/configs/rk3368_common.h               | 1 -
 include/configs/rk3399_common.h               | 1 -
 include/configs/rk3568_common.h               | 1 -
 include/configs/salvator-x.h                  | 3 ---
 include/configs/sdm845.h                      | 3 ---
 include/configs/silinux-ek874.h               | 3 ---
 include/configs/socfpga_soc64_common.h        | 5 -----
 include/configs/ten64.h                       | 1 -
 include/configs/thunderx_88xx.h               | 3 ---
 include/configs/ulcb.h                        | 3 ---
 include/configs/vexpress_aemv8.h              | 3 ---
 49 files changed, 2 insertions(+), 121 deletions(-)
arch/arm/cpu/armv8/fsl-layerscape/spintable.S +1 -1
index d6bd1884599..1eb0c2d4a7e 100644
@@ -113,6 +113,6 @@ _dead_loop:
 	.align 3
 	.global __real_cntfrq
 __real_cntfrq:
-	.quad COUNTER_FREQUENCY
+	.quad CONFIG_COUNTER_FREQUENCY
 	/* Secondary Boot Code ends here */
 __secondary_boot_code_end:
include/configs/apalis-imx8.h +0 -3
index c87bcd475ef..e759f18fe46 100644
@@ -84,7 +84,4 @@
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		8000000	/* 8MHz */
-
 #endif /* __APALIS_IMX8_H */
include/configs/apalis-imx8x.h +0 -3
index 71a80f38bbb..17f1981643f 100644
@@ -115,9 +115,6 @@
 #define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE + \
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		8000000	/* 8MHz */
-
 /* Networking */
 #define CONFIG_FEC_ENET_DEV 0
 #define IMX_FEC_BASE			0x5b040000
include/configs/capricorn-common.h +0 -3
index 58d7a3a8ce2..1466be10fcd 100644
@@ -123,9 +123,6 @@
 #define CONFIG_SYS_MAXARGS		64
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		8000000	/* 8MHz */
-
 #define BOOTAUX_RESERVED_MEM_BASE	0x88000000
 #define BOOTAUX_RESERVED_MEM_SIZE	SZ_128M /* Reserve from second 128MB */
 
include/configs/cgtqmx8.h +0 -3
index bd5c072382a..b5817f1e42d 100644
@@ -131,9 +131,6 @@
 #define PHYS_SDRAM_1_SIZE		0x80000000	/* 2 GB */
 #define PHYS_SDRAM_2_SIZE		0x100000000	/* 4 GB */
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		8000000	/* 8MHz */
-
 /* Networking */
 #define CONFIG_FEC_MXC_PHYADDR		-1
 #define FEC_QUIRK_ENET_MAC
include/configs/colibri-imx8x.h +0 -1
index 008fa6ef076..265b7294fed 100644
@@ -119,7 +119,6 @@
 					sizeof(CONFIG_SYS_PROMPT) + 16)
 
 /* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		8000000	/* 8MHz */
 
 #define BOOTAUX_RESERVED_MEM_BASE 0x88000000
 #define BOOTAUX_RESERVED_MEM_SIZE SZ_128M /* Reserve from second 128MB */
include/configs/condor.h +0 -3
index 213e68f1587..819184996e6 100644
@@ -24,7 +24,4 @@
 /* Board Clock */
 /* XTAL_CLK : 33.33MHz */
 
-/* Generic Timer Definitions (use in assembler source) */
-#define COUNTER_FREQUENCY	0xFE502A	/* 16.66MHz from CPclk */
-
 #endif /* __CONDOR_H */
include/configs/draak.h +0 -3
index 5bd8740c6f8..476b4c3710a 100644
@@ -11,9 +11,6 @@
 
 #include "rcar-gen3-common.h"
 
-/* Generic Timer Definitions (use in assembler source) */
-#define COUNTER_FREQUENCY	0xFE502A	/* 16.66MHz from CPclk */
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 #define CONFIG_FLASH_SHOW_PROGRESS	45
include/configs/dragonboard410c.h +0 -3
index 43a179f013b..14ba52a2eb3 100644
@@ -23,9 +23,6 @@
 
 /* UART */
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		19000000
-
 /* Fixup - in init code we switch from device to host mode,
  * it has to be done after each HCD reset */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/dragonboard820c.h +0 -3
index 229e1a323b6..1e2b15b33f9 100644
@@ -23,9 +23,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x7fff0)
 #define CONFIG_SYS_BOOTM_LEN		SZ_64M
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		19000000
-
 #ifndef CONFIG_SPL_BUILD
 #include <config_distro_bootcmd.h>
 #endif
include/configs/eagle.h +0 -3
index 42fe0577167..c751f75a7d0 100644
@@ -16,7 +16,4 @@
 /* Board Clock */
 /* XTAL_CLK : 33.33MHz */
 
-/* Generic Timer Definitions (use in assembler source) */
-#define COUNTER_FREQUENCY	0xFE502A	/* 16.66MHz from CPclk */
-
 #endif /* __EAGLE_H */
include/configs/ebisu.h +0 -3
index ce31a462fcf..3adc4180efd 100644
@@ -13,9 +13,6 @@
 
 #include "rcar-gen3-common.h"
 
-/* Generic Timer Definitions (use in assembler source) */
-#define COUNTER_FREQUENCY	0xFE502A	/* 16.66MHz from CPclk */
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 #define CONFIG_FLASH_SHOW_PROGRESS	45
include/configs/exynos7420-common.h +0 -3
index fcb238fb3e3..5658da474cb 100644
@@ -24,9 +24,6 @@
 
 /* select serial console configuration */
 
-/* Timer input clock frequency */
-#define COUNTER_FREQUENCY		24000000
-
 /* IRAM Layout */
 #define CONFIG_IRAM_BASE		0x02100000
 #define CONFIG_IRAM_SIZE		0x58000
include/configs/exynos78x0-common.h +0 -3
index 457057ce71f..ec43e133dde 100644
@@ -25,9 +25,6 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
-/* Timer input clock frequency */
-#define COUNTER_FREQUENCY		26000000
-
 #define CPU_RELEASE_ADDR		secondary_boot_addr
 
 #define CONFIG_SYS_BAUDRATE_TABLE \
include/configs/falcon.h +0 -3
index 52dcf19ccad..446261cedc7 100644
@@ -24,7 +24,4 @@
 /* Board Clock */
 /* XTAL_CLK : 16.66MHz */
 
-/* Generic Timer Definitions (use in assembler source) */
-#define COUNTER_FREQUENCY	0xFE502A	/* 16.66MHz from CPclk */
-
 #endif /* __FALCON_H */
include/configs/hihope-rzg2.h +0 -3
index e46eb07a5e9..54702985b95 100644
@@ -11,7 +11,4 @@
 
 #include "rcar-gen3-common.h"
 
-/* Generic Timer Definitions (use in assembler source) */
-#define COUNTER_FREQUENCY	0xFE502A	/* 16.66MHz from CPclk */
-
 #endif /* __HIHOPE_RZG2_H */
include/configs/hikey.h +0 -3
index 29a0d943864..19d5b6261f1 100644
@@ -32,9 +32,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		19000000
-
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE			0xf6801000
 #define GICC_BASE			0xf6802000
include/configs/hikey960.h +0 -3
index f446ecb8647..c088f2f2b69 100644
@@ -24,9 +24,6 @@
 
 #define CONFIG_SYS_INIT_SP_ADDR         (CONFIG_SYS_SDRAM_BASE + 0x7fff0)
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		19000000
-
 /* Generic Interrupt Controller Definitions */
 #define GICD_BASE			0xe82b1000
 #define GICC_BASE			0xe82b2000
include/configs/imx8qm_mek.h +0 -3
index 0fe38e61c4b..a9c52d27500 100644
@@ -130,7 +130,4 @@
 #define PHYS_SDRAM_1_SIZE		0x80000000	/* 2 GB */
 #define PHYS_SDRAM_2_SIZE		0x100000000	/* 4 GB */
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		8000000	/* 8MHz */
-
 #endif /* __IMX8QM_MEK_H */
include/configs/imx8qm_rom7720.h +0 -3
index 7532c6e7551..c7cace2c36f 100644
@@ -124,8 +124,5 @@
 /* LPDDR4 board total DDR is 6GB, DDR4 board total DDR is 4 GB */
 #define PHYS_SDRAM_2_SIZE		0x80000000	/* 2 GB */
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		8000000	/* 8MHz */
-
 #include <linux/stringify.h>
 #endif /* __IMX8QM_ROM7720_H */
include/configs/imx8qxp_mek.h +0 -3
index beb35c93435..9052a9142e2 100644
@@ -129,9 +129,6 @@
 /* LPDDR4 board total DDR is 3GB */
 #define PHYS_SDRAM_2_SIZE		0x40000000	/* 1 GB */
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		8000000	/* 8MHz */
-
 #ifndef CONFIG_DM_PCA953X
 #define CONFIG_PCA953X
 #endif
include/configs/ls1012a_common.h +0 -3
index f92ff17eeb8..67da01f5e3a 100644
@@ -21,9 +21,6 @@
 #define CONFIG_SYS_SDRAM_BASE		CONFIG_SYS_DDR_SDRAM_BASE
 #define CONFIG_SYS_DDR_BLOCK2_BASE     0x880000000ULL
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		25000000	/* 25MHz */
-
 /* CSU */
 #define CONFIG_LAYERSCAPE_NS_ACCESS
 
include/configs/ls1028a_common.h +0 -3
index 7bb6d416ea3..a98d8dd7200 100644
@@ -25,9 +25,6 @@
  */
 #define CPU_RELEASE_ADDR		secondary_boot_addr
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		25000000	/* 25MHz */
-
 /* GPIO */
 
 /* I2C */
include/configs/ls1043a_common.h +0 -3
index 83b95c242f0..61c6d456764 100644
@@ -44,9 +44,6 @@
 
 #define CPU_RELEASE_ADDR               secondary_boot_addr
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		25000000	/* 25MHz */
-
 /* Serial Port */
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE	1
include/configs/ls1046a_common.h +0 -3
index 7552610e035..f9279e4ab46 100644
@@ -44,9 +44,6 @@
 
 #define CPU_RELEASE_ADDR               secondary_boot_addr
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		25000000	/* 25MHz */
-
 /* Serial Port */
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE	1
include/configs/ls2080a_common.h +0 -2
index 82585f5dbfa..e77e9b7f376 100644
@@ -41,12 +41,10 @@
 
 #define CONFIG_SYS_FSL_OTHER_DDR_NUM_CTRLS
 
-/* Generic Timer Definitions */
 /*
  * This is not an accurate number. It is used in start.S. The frequency
  * will be udpated later when get_bus_freq(0) is available.
  */
-#define COUNTER_FREQUENCY		25000000	/* 25MHz */
 
 /* GPIO */
 
include/configs/mt8183.h +0 -1
index 2b4e976aa1f..ee31c02e6ef 100644
@@ -11,7 +11,6 @@
 
 #include <linux/sizes.h>
 
-#define COUNTER_FREQUENCY		13000000
 
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
include/configs/mt8512.h +0 -1
index 9c443db9f52..1af8d2e480c 100644
@@ -13,7 +13,6 @@
 
 #define CONFIG_SYS_NONCACHED_MEMORY		SZ_1M
 
-#define COUNTER_FREQUENCY			13000000
 
 #define CONFIG_SYS_BOOTM_LEN			SZ_64M
 
include/configs/mt8516.h +0 -1
index 47132c1db1d..cb2af5843fc 100644
@@ -11,7 +11,6 @@
 
 #include <linux/sizes.h>
 
-#define COUNTER_FREQUENCY		13000000
 
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE	-4
include/configs/mt8518.h +0 -1
index 49ee926b0c9..8ca8d25148a 100644
@@ -13,7 +13,6 @@
 
 #define CONFIG_SYS_NONCACHED_MEMORY		SZ_1M
 
-#define COUNTER_FREQUENCY			13000000
 
 /* DRAM definition */
 #define CONFIG_SYS_SDRAM_BASE			0x40000000
include/configs/owl-common.h +0 -3
index 96453214eeb..fabbb01e0c8 100644
@@ -13,9 +13,6 @@
 /* SDRAM Definitions */
 #define CONFIG_SYS_SDRAM_BASE		0x0
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		(24000000)	/* 24MHz */
-
 /* Some commands use this as the default load address */
 
 /*
include/configs/p2371-2180.h +0 -3
index ef1fa2a5926..7f942888e74 100644
@@ -24,7 +24,4 @@
 
 #include "tegra-common-post.h"
 
-/* Crystal is 38.4MHz. clk_m runs at half that rate */
-#define COUNTER_FREQUENCY	19200000
-
 #endif /* _P2371_2180_H */
include/configs/p2771-0000.h +0 -3
index 4c3da224c66..84cdd571962 100644
@@ -37,7 +37,4 @@
 
 #include "tegra-common-post.h"
 
-/* Crystal is 38.4MHz. clk_m runs at half that rate */
-#define COUNTER_FREQUENCY	19200000
-
 #endif
include/configs/p3450-0000.h +0 -3
index 1c962be8b8e..ec1a8634e71 100644
@@ -35,7 +35,4 @@
 /* General networking support */
 #include "tegra-common-post.h"
 
-/* Crystal is 38.4MHz. clk_m runs at half that rate */
-#define COUNTER_FREQUENCY	19200000
-
 #endif /* _P3450_0000_H */
include/configs/presidio_asic.h +1 -2
index 3295d43ed67..1d526a73802 100644
@@ -12,8 +12,7 @@
 #define CONFIG_SYS_BOOTM_LEN		0x00c00000
 
 /* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		25000000
-#define CONFIG_SYS_TIMER_RATE		COUNTER_FREQUENCY
+#define CONFIG_SYS_TIMER_RATE		25000000
 #define CONFIG_SYS_TIMER_COUNTER	0xf4321008
 
 /* note: arch/arm/cpu/armv8/start.S which references GICD_BASE/GICC_BASE
include/configs/px30_common.h +0 -1
index 09923871571..a7e8dabff52 100644
@@ -13,7 +13,6 @@
 #define CONFIG_SYS_NS16550_MEM32
 
 #define CONFIG_ROCKCHIP_STIMER_BASE	0xff220020
-#define COUNTER_FREQUENCY		24000000
 
 /* FIXME: ff020000 is pmu_mem (10k), while ff0e0000 is regular int_mem */
 #define CONFIG_IRAM_BASE		0xff020000
include/configs/rk3308_common.h +0 -1
index 1664707ca65..cc7fd03d0de 100644
@@ -21,7 +21,6 @@
 #define CONFIG_SPL_STACK		0x00400000
 #define CONFIG_SYS_BOOTM_LEN		(64 << 20)	/* 64M */
 
-#define COUNTER_FREQUENCY		24000000
 
 #define CONFIG_SYS_BOOTM_LEN	(64 << 20)	/* 64M */
 
include/configs/rk3328_common.h +0 -1
index c1e26a019b5..a40ef1290ed 100644
@@ -11,7 +11,6 @@
 #define CONFIG_IRAM_BASE		0xff090000
 
 #define CONFIG_ROCKCHIP_STIMER_BASE    0xff1d0020
-#define COUNTER_FREQUENCY		24000000
 
 #define CONFIG_SYS_CBSIZE		1024
 
include/configs/rk3368_common.h +0 -1
index 8b239ca07da..c33b654990b 100644
@@ -16,7 +16,6 @@
 #define CONFIG_SYS_CBSIZE		1024
 
 #define CONFIG_ROCKCHIP_STIMER_BASE	0xff830020
-#define COUNTER_FREQUENCY		24000000
 
 #define CONFIG_IRAM_BASE		0xff8c0000
 
include/configs/rk3399_common.h +0 -1
index ed72c8bb6b1..53d1d0e9a6c 100644
@@ -10,7 +10,6 @@
 
 #define CONFIG_SYS_CBSIZE		1024
 
-#define COUNTER_FREQUENCY               24000000
 #define CONFIG_ROCKCHIP_STIMER_BASE	0xff8680a0
 
 #define CONFIG_IRAM_BASE		0xff8c0000
include/configs/rk3568_common.h +0 -1
index 25d7c5cc8ff..9197d10bf2b 100644
@@ -10,7 +10,6 @@
 
 #define CONFIG_SYS_CBSIZE		1024
 
-#define COUNTER_FREQUENCY               24000000
 #define CONFIG_ROCKCHIP_STIMER_BASE	0xfdd1c020
 
 #define CONFIG_IRAM_BASE		0xfdcc0000
include/configs/salvator-x.h +0 -3
index 764bc1bbf29..eb00e2b004b 100644
@@ -11,9 +11,6 @@
 
 #include "rcar-gen3-common.h"
 
-/* Generic Timer Definitions (use in assembler source) */
-#define COUNTER_FREQUENCY	0xFE502A	/* 16.66MHz from CPclk */
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 #define CONFIG_FLASH_SHOW_PROGRESS	45
include/configs/sdm845.h +0 -3
index ba57323c74b..835f05d63e2 100644
@@ -13,9 +13,6 @@
 
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 115200, 230400, 460800, 921600 }
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY	19000000
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x4000000\0"	\
 	"bootm_low=0x80000000\0"	\
include/configs/silinux-ek874.h +0 -3
index a99babb48b0..346858c456c 100644
@@ -11,7 +11,4 @@
 
 #include "rcar-gen3-common.h"
 
-/* Generic Timer Definitions (use in assembler source) */
-#define COUNTER_FREQUENCY	0xFE502A	/* 16.66MHz from CPclk */
-
 #endif /* __SILINUX_EK874_H */
include/configs/socfpga_soc64_common.h +0 -5
index c288d548f5b..3447b8f17c2 100644
@@ -108,11 +108,6 @@
 #define CONFIG_SYS_NS16550_CLK		100000000
 #define CONFIG_SYS_NS16550_MEM32
 
-/*
- * Timer & watchdog configurations
- */
-#define COUNTER_FREQUENCY		400000000
-
 /*
  * SDMMC configurations
  */
include/configs/ten64.h +0 -1
index f82b1e0d212..04772c9e4ef 100644
@@ -9,7 +9,6 @@
 
 #include "ls1088a_common.h"
 
-#define COUNTER_FREQUENCY		25000000	/* 25MHz */
 
 #define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
 
include/configs/thunderx_88xx.h +0 -3
index d07a8fe86bc..3537ba30e1f 100644
@@ -20,9 +20,6 @@
 /* SMP Spin Table Definitions */
 #define CPU_RELEASE_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x7fff0)
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		(0x1800000)	/* 24MHz */
-
 /* PL011 Serial Configuration */
 
 #define CONFIG_PL011_CLOCK		24000000
include/configs/ulcb.h +0 -3
index c991bff0e88..14ea40bee3e 100644
@@ -11,9 +11,6 @@
 
 #include "rcar-gen3-common.h"
 
-/* Generic Timer Definitions (use in assembler source) */
-#define COUNTER_FREQUENCY	0xFE502A	/* 16.66MHz from CPclk */
-
 /* Environment in eMMC, at the end of 2nd "boot sector" */
 
 #define CONFIG_FLASH_SHOW_PROGRESS	45
include/configs/vexpress_aemv8.h +0 -3
index 4f0ff239e68..0632b367cad 100644
@@ -73,9 +73,6 @@
 #define V2M_SYS_CFGCTRL			(V2M_SYSREGS + 0x0a4)
 #define V2M_SYS_CFGSTAT			(V2M_SYSREGS + 0x0a8)
 
-/* Generic Timer Definitions */
-#define COUNTER_FREQUENCY		24000000	/* 24MHz */
-
 /* Generic Interrupt Controller Definitions */
 #ifdef CONFIG_GICV3
 #define GICD_BASE			(V2M_PA_BASE + 0x2f000000)
Signature · 1 line
2.35.1
#7 lore raw
In reply to Peng Fan (OSS)
Quoted 2 lines

Subject: [PATCH V3 0/6] Convert COUNTER_FREQUENCY to CONFIG_COUNTER_FREQUENCY

Seems I need post a V4, some arm64 boards are not handled by my script.

Sorry for re-spin so fast.

Thanks,
Peng.

Quoted 169 lines

From: Peng Fan <[email protected]>

V3:
Add more help info for CONFIG_COUNTER_FREQUENCY Drop uneeded
comments Pass git bisect build Rebased

V2:
Drop imx93 which is wrongly included

This patchset is to convert COUNTER_FREQUENCY to CONFIG_COUNTER_FREQUENCY for arm64. arm32 is not included for now, this could be in following up patches if this patchset is accepted.

This patchset touches lots of boards, so please help review.

Peng Fan (6):
xilinx: versal: board: use CONFIG_COUNTER_FREQUENCY
arch: arm: move COUNTER_FREQUENCY from versal to arm
arch: arm: Kconfig: set default COUNTER_FREQUENCY for i.MX
configs: set CONFIG_COUNTER_FREQUENCY
armv8: set cntfrq_el0 if CONFIG_COUNTER_FREQUENCY is valid include/configs: drop COUNTER_FREQUENCY

 arch/arm/Kconfig                              | 13 +++++++++++++
 arch/arm/cpu/armv8/fsl-layerscape/spintable.S |  2 +-
 arch/arm/cpu/armv8/start.S                    |  4 ++--
 arch/arm/mach-versal/Kconfig                  |  6 ------
 board/xilinx/versal/board.c                   |  2 +-
 configs/a3y17lte_defconfig                    |  1 +
 configs/a5y17lte_defconfig                    |  1 +
 configs/a7y17lte_defconfig                    |  1 +
 configs/apalis-imx8_defconfig                 |  1 +
 configs/apalis-imx8x_defconfig                |  1 +
 configs/bubblegum_96_defconfig                |  1 +
 configs/cgtqmx8_defconfig                     |  1 +
 configs/colibri-imx8x_defconfig               |  1 +
 configs/cortina_presidio-asic-base_defconfig  |  1 +  configs/cortina_presidio-
asic-emmc_defconfig  |  1 +  configs/cortina_presidio-asic-pnand_defconfig |  1
+
 configs/cubieboard7_defconfig                 |  1 +
 configs/deneb_defconfig                       |  1 +
 configs/dragonboard410c_defconfig             |  1 +
 configs/dragonboard820c_defconfig             |  1 +
 configs/espresso7420_defconfig                |  1 +
 configs/evb-px30_defconfig                    |  1 +
 configs/evb-px5_defconfig                     |  1 +
 configs/evb-rk3308_defconfig                  |  1 +
 configs/evb-rk3328_defconfig                  |  1 +
 configs/evb-rk3399_defconfig                  |  1 +
 configs/evb-rk3568_defconfig                  |  1 +
 configs/firefly-px30_defconfig                |  1 +
 configs/firefly-rk3399_defconfig              |  1 +
 configs/hihope_rzg2_defconfig                 |  1 +
 configs/hikey960_defconfig                    |  1 +
 configs/hikey_defconfig                       |  1 +
 configs/imx8qm_mek_defconfig                  |  1 +
 configs/imx8qm_rom7720_a1_4G_defconfig        |  1 +
 configs/imx8qxp_mek_defconfig                 |  1 +
 configs/khadas-edge-captain-rk3399_defconfig  |  1 +
 configs/khadas-edge-rk3399_defconfig          |  1 +
 configs/khadas-edge-v-rk3399_defconfig        |  1 +
 configs/leez-rk3399_defconfig                 |  1 +
 configs/ls1012a2g5rdb_qspi_defconfig          |  1 +
 configs/ls1012a2g5rdb_tfa_defconfig           |  1 +
 configs/ls1043aqds_defconfig                  |  1 +
 configs/ls1043aqds_lpuart_defconfig           |  1 +
 configs/ls1043aqds_nand_defconfig             |  1 +
 configs/ls1043aqds_nor_ddr3_defconfig         |  1 +
 configs/ls1043aqds_qspi_defconfig             |  1 +
 configs/ls1043aqds_sdcard_ifc_defconfig       |  1 +
 configs/ls1043aqds_sdcard_qspi_defconfig      |  1 +
 configs/ls1043aqds_tfa_SECURE_BOOT_defconfig  |  1 +
 configs/ls1043aqds_tfa_defconfig              |  1 +
 configs/ls1046afrwy_tfa_SECURE_BOOT_defconfig |  1 +
 configs/ls1046afrwy_tfa_defconfig             |  1 +
 configs/mt8183_pumpkin_defconfig              |  1 +
 configs/mt8512_bm1_emmc_defconfig             |  1 +
 configs/mt8516_pumpkin_defconfig              |  1 +
 configs/mt8518_ap1_emmc_defconfig             |  1 +
 configs/nanopc-t4-rk3399_defconfig            |  1 +
 configs/nanopi-m4-2gb-rk3399_defconfig        |  1 +
 configs/nanopi-m4-rk3399_defconfig            |  1 +
 configs/nanopi-m4b-rk3399_defconfig           |  1 +
 configs/nanopi-neo4-rk3399_defconfig          |  1 +
 configs/nanopi-r2s-rk3328_defconfig           |  1 +
 configs/nanopi-r4s-rk3399_defconfig           |  1 +
 configs/orangepi-rk3399_defconfig             |  1 +
 configs/p2371-2180_defconfig                  |  1 +
 configs/p2771-0000-000_defconfig              |  1 +
 configs/p2771-0000-500_defconfig              |  1 +
 configs/p3450-0000_defconfig                  |  1 +
 configs/r8a77970_eagle_defconfig              |  1 +
 configs/r8a77980_condor_defconfig             |  1 +
 configs/r8a77990_ebisu_defconfig              |  1 +
 configs/r8a77995_draak_defconfig              |  1 +
 configs/r8a779a0_falcon_defconfig             |  1 +
 configs/rcar3_salvator-x_defconfig            |  1 +
 configs/rcar3_ulcb_defconfig                  |  1 +
 configs/roc-cc-rk3328_defconfig               |  1 +
 configs/rock-pi-4-rk3399_defconfig            |  1 +
 configs/rock-pi-4c-rk3399_defconfig           |  1 +
 configs/rock-pi-e-rk3328_defconfig            |  1 +
 configs/rock-pi-n10-rk3399pro_defconfig       |  1 +
 configs/rock64-rk3328_defconfig               |  1 +
 configs/silinux_ek874_defconfig               |  1 +
 configs/socfpga_agilex_atf_defconfig          |  1 +
 configs/socfpga_agilex_defconfig              |  1 +
 configs/socfpga_agilex_vab_defconfig          |  1 +
 configs/starqltechn_defconfig                 |  1 +
 configs/ten64_tfa_defconfig                   |  1 +
 configs/thunderx_88xx_defconfig               |  1 +
 configs/vexpress_aemv8a_juno_defconfig        |  1 +
 configs/vexpress_aemv8a_semi_defconfig        |  1 +
 configs/vexpress_aemv8r_defconfig             |  1 +
 include/configs/apalis-imx8.h                 |  3 ---
 include/configs/apalis-imx8x.h                |  3 ---
 include/configs/capricorn-common.h            |  3 ---
 include/configs/cgtqmx8.h                     |  3 ---
 include/configs/colibri-imx8x.h               |  1 -
 include/configs/condor.h                      |  3 ---
 include/configs/draak.h                       |  3 ---
 include/configs/dragonboard410c.h             |  3 ---
 include/configs/dragonboard820c.h             |  3 ---
 include/configs/eagle.h                       |  3 ---
 include/configs/ebisu.h                       |  3 ---
 include/configs/exynos7420-common.h           |  3 ---
 include/configs/exynos78x0-common.h           |  3 ---
 include/configs/falcon.h                      |  3 ---
 include/configs/hihope-rzg2.h                 |  3 ---
 include/configs/hikey.h                       |  3 ---
 include/configs/hikey960.h                    |  3 ---
 include/configs/imx8qm_mek.h                  |  3 ---
 include/configs/imx8qm_rom7720.h              |  3 ---
 include/configs/imx8qxp_mek.h                 |  3 ---
 include/configs/ls1012a_common.h              |  3 ---
 include/configs/ls1028a_common.h              |  3 ---
 include/configs/ls1043a_common.h              |  3 ---
 include/configs/ls1046a_common.h              |  3 ---
 include/configs/ls2080a_common.h              |  2 --
 include/configs/mt8183.h                      |  1 -
 include/configs/mt8512.h                      |  1 -
 include/configs/mt8516.h                      |  1 -
 include/configs/mt8518.h                      |  1 -
 include/configs/owl-common.h                  |  3 ---
 include/configs/p2371-2180.h                  |  3 ---
 include/configs/p2771-0000.h                  |  3 ---
 include/configs/p3450-0000.h                  |  3 ---
 include/configs/presidio_asic.h               |  3 +--
 include/configs/px30_common.h                 |  1 -
 include/configs/rk3308_common.h               |  1 -
 include/configs/rk3328_common.h               |  1 -
 include/configs/rk3368_common.h               |  1 -
 include/configs/rk3399_common.h               |  1 -
 include/configs/rk3568_common.h               |  1 -
 include/configs/salvator-x.h                  |  3 ---
 include/configs/sdm845.h                      |  3 ---
 include/configs/silinux-ek874.h               |  3 ---
 include/configs/socfpga_soc64_common.h        |  5 -----
 include/configs/ten64.h                       |  1 -
 include/configs/thunderx_88xx.h               |  3 ---
 include/configs/ulcb.h                        |  3 ---
 include/configs/vexpress_aemv8.h              |  3 ---
 139 files changed, 104 insertions(+), 130 deletions(-)

--
2.35.1