From: Peng Fan peng.fan@nxp.com
Since we have CONFIG_COUNTER_FREQUENCY enabled, no need COUNTER_FREQUENCY
Signed-off-by: Peng Fan peng.fan@nxp.com --- 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/exynos-common.h | 1 - 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/kontron_sl28.h | 1 - include/configs/ls1012a_common.h | 3 --- include/configs/ls1021aiot.h | 1 - include/configs/ls1021aqds.h | 1 - include/configs/ls1021atsn.h | 1 - include/configs/ls1021atwr.h | 1 - include/configs/ls1028a_common.h | 3 --- include/configs/ls1043a_common.h | 3 --- include/configs/ls1046a_common.h | 3 --- include/configs/ls1088aqds.h | 1 - include/configs/ls1088ardb.h | 1 - include/configs/ls2080a_common.h | 2 -- include/configs/lx2160a_common.h | 1 - include/configs/mt8183.h | 1 - include/configs/mt8512.h | 1 - include/configs/mt8516.h | 1 - include/configs/mt8518.h | 1 - include/configs/mx6_common.h | 1 - include/configs/mx7_common.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/rk3036_common.h | 1 - include/configs/rk3128_common.h | 1 - include/configs/rk322x_common.h | 1 - include/configs/rk3288_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/sunxi-common.h | 1 - include/configs/ten64.h | 1 - include/configs/thunderx_88xx.h | 3 --- include/configs/ulcb.h | 3 --- include/configs/vexpress_aemv8.h | 3 --- include/configs/xilinx_versal.h | 5 ----- include/configs/xilinx_zynqmp.h | 5 ----- 67 files changed, 2 insertions(+), 147 deletions(-)
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spintable.S b/arch/arm/cpu/armv8/fsl-layerscape/spintable.S index d6bd1884599..1eb0c2d4a7e 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spintable.S +++ b/arch/arm/cpu/armv8/fsl-layerscape/spintable.S @@ -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: diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index c87bcd475ef..e759f18fe46 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -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 */ diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h index 71a80f38bbb..17f1981643f 100644 --- a/include/configs/apalis-imx8x.h +++ b/include/configs/apalis-imx8x.h @@ -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 diff --git a/include/configs/capricorn-common.h b/include/configs/capricorn-common.h index 58d7a3a8ce2..1466be10fcd 100644 --- a/include/configs/capricorn-common.h +++ b/include/configs/capricorn-common.h @@ -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 */
diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index bd5c072382a..b5817f1e42d 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -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 diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 008fa6ef076..265b7294fed 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -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 */ diff --git a/include/configs/condor.h b/include/configs/condor.h index 213e68f1587..819184996e6 100644 --- a/include/configs/condor.h +++ b/include/configs/condor.h @@ -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 */ diff --git a/include/configs/draak.h b/include/configs/draak.h index 5bd8740c6f8..476b4c3710a 100644 --- a/include/configs/draak.h +++ b/include/configs/draak.h @@ -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 diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 43a179f013b..14ba52a2eb3 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -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 diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h index 229e1a323b6..1e2b15b33f9 100644 --- a/include/configs/dragonboard820c.h +++ b/include/configs/dragonboard820c.h @@ -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 diff --git a/include/configs/eagle.h b/include/configs/eagle.h index 42fe0577167..c751f75a7d0 100644 --- a/include/configs/eagle.h +++ b/include/configs/eagle.h @@ -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 */ diff --git a/include/configs/ebisu.h b/include/configs/ebisu.h index ce31a462fcf..3adc4180efd 100644 --- a/include/configs/ebisu.h +++ b/include/configs/ebisu.h @@ -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 diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index eb2606905f8..dd1cbd7ab84 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -19,7 +19,6 @@ /* Keep L2 Cache Disabled */
/* input clock of PLL: 24MHz input clock */ -#define COUNTER_FREQUENCY 24000000
/* select serial console configuration */
diff --git a/include/configs/exynos7420-common.h b/include/configs/exynos7420-common.h index fcb238fb3e3..5658da474cb 100644 --- a/include/configs/exynos7420-common.h +++ b/include/configs/exynos7420-common.h @@ -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 diff --git a/include/configs/exynos78x0-common.h b/include/configs/exynos78x0-common.h index 457057ce71f..ec43e133dde 100644 --- a/include/configs/exynos78x0-common.h +++ b/include/configs/exynos78x0-common.h @@ -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 \ diff --git a/include/configs/falcon.h b/include/configs/falcon.h index 52dcf19ccad..446261cedc7 100644 --- a/include/configs/falcon.h +++ b/include/configs/falcon.h @@ -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 */ diff --git a/include/configs/hihope-rzg2.h b/include/configs/hihope-rzg2.h index e46eb07a5e9..54702985b95 100644 --- a/include/configs/hihope-rzg2.h +++ b/include/configs/hihope-rzg2.h @@ -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 */ diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 29a0d943864..19d5b6261f1 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -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 diff --git a/include/configs/hikey960.h b/include/configs/hikey960.h index f446ecb8647..c088f2f2b69 100644 --- a/include/configs/hikey960.h +++ b/include/configs/hikey960.h @@ -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 diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index 0fe38e61c4b..a9c52d27500 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -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 */ diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index 7532c6e7551..c7cace2c36f 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -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 */ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index beb35c93435..9052a9142e2 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -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 diff --git a/include/configs/kontron_sl28.h b/include/configs/kontron_sl28.h index 97286b6180a..93caf9b338d 100644 --- a/include/configs/kontron_sl28.h +++ b/include/configs/kontron_sl28.h @@ -32,7 +32,6 @@ #define CPU_RELEASE_ADDR secondary_boot_addr
/* generic timer */ -#define COUNTER_FREQUENCY 25000000
/* early heap for SPL DM */ #define CONFIG_MALLOC_F_ADDR CONFIG_SYS_FSL_OCRAM_BASE diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h index f92ff17eeb8..67da01f5e3a 100644 --- a/include/configs/ls1012a_common.h +++ b/include/configs/ls1012a_common.h @@ -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
diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 97460818315..82ae3492a2f 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -119,7 +119,6 @@ #define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_LAYERSCAPE_NS_ACCESS #define CONFIG_SMP_PEN_ADDR 0x01ee0200 -#define COUNTER_FREQUENCY 12500000
#define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 256 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 010f3a16367..7b79e0841a5 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -334,7 +334,6 @@ #define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_LAYERSCAPE_NS_ACCESS #define CONFIG_SMP_PEN_ADDR 0x01ee0200 -#define COUNTER_FREQUENCY 12500000
#define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 256 diff --git a/include/configs/ls1021atsn.h b/include/configs/ls1021atsn.h index bc2a265c409..546c4fcdb95 100644 --- a/include/configs/ls1021atsn.h +++ b/include/configs/ls1021atsn.h @@ -99,7 +99,6 @@ #endif
#define CONFIG_LAYERSCAPE_NS_ACCESS -#define COUNTER_FREQUENCY 12500000
#define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 256 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 6b1ab875399..b4383d4bbdb 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -192,7 +192,6 @@ #define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_LAYERSCAPE_NS_ACCESS #define CONFIG_SMP_PEN_ADDR 0x01ee0200 -#define COUNTER_FREQUENCY 12500000
#define CONFIG_HWCONFIG #define HWCONFIG_BUFFER_SIZE 256 diff --git a/include/configs/ls1028a_common.h b/include/configs/ls1028a_common.h index 7bb6d416ea3..a98d8dd7200 100644 --- a/include/configs/ls1028a_common.h +++ b/include/configs/ls1028a_common.h @@ -25,9 +25,6 @@ */ #define CPU_RELEASE_ADDR secondary_boot_addr
-/* Generic Timer Definitions */ -#define COUNTER_FREQUENCY 25000000 /* 25MHz */ - /* GPIO */
/* I2C */ diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 83b95c242f0..61c6d456764 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -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 diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 7552610e035..f9279e4ab46 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -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 diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h index 1ea6befa9b9..e532c343f48 100644 --- a/include/configs/ls1088aqds.h +++ b/include/configs/ls1088aqds.h @@ -13,7 +13,6 @@ #endif
#define COUNTER_FREQUENCY_REAL (get_board_sys_clk()/4) -#define COUNTER_FREQUENCY 25000000 /* 25MHz */
#define CONFIG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS 0x51 diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index 1a9cda1e7da..693a2f64b6c 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -14,7 +14,6 @@ #endif
#define COUNTER_FREQUENCY_REAL 25000000 /* 25MHz */ -#define COUNTER_FREQUENCY 25000000 /* 25MHz */
#ifdef CONFIG_EMU #define CONFIG_SYS_FSL_DDR_EMU diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 82585f5dbfa..e77e9b7f376 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -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 */
diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index 96dfe49a7e5..d5690148195 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -46,7 +46,6 @@ * will be udpated later when get_bus_freq(0) is available. */
-#define COUNTER_FREQUENCY 25000000 /* 25MHz */
/* Serial Port */ #define CONFIG_PL011_CLOCK (get_bus_freq(0) / 4) diff --git a/include/configs/mt8183.h b/include/configs/mt8183.h index 2b4e976aa1f..ee31c02e6ef 100644 --- a/include/configs/mt8183.h +++ b/include/configs/mt8183.h @@ -11,7 +11,6 @@
#include <linux/sizes.h>
-#define COUNTER_FREQUENCY 13000000
#define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE -4 diff --git a/include/configs/mt8512.h b/include/configs/mt8512.h index 9c443db9f52..1af8d2e480c 100644 --- a/include/configs/mt8512.h +++ b/include/configs/mt8512.h @@ -13,7 +13,6 @@
#define CONFIG_SYS_NONCACHED_MEMORY SZ_1M
-#define COUNTER_FREQUENCY 13000000
#define CONFIG_SYS_BOOTM_LEN SZ_64M
diff --git a/include/configs/mt8516.h b/include/configs/mt8516.h index 47132c1db1d..cb2af5843fc 100644 --- a/include/configs/mt8516.h +++ b/include/configs/mt8516.h @@ -11,7 +11,6 @@
#include <linux/sizes.h>
-#define COUNTER_FREQUENCY 13000000
#define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE -4 diff --git a/include/configs/mt8518.h b/include/configs/mt8518.h index 49ee926b0c9..8ca8d25148a 100644 --- a/include/configs/mt8518.h +++ b/include/configs/mt8518.h @@ -13,7 +13,6 @@
#define CONFIG_SYS_NONCACHED_MEMORY SZ_1M
-#define COUNTER_FREQUENCY 13000000
/* DRAM definition */ #define CONFIG_SYS_SDRAM_BASE 0x40000000 diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index a0e481703bc..10e46c628d5 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -10,7 +10,6 @@
#if (defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)) #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ -#define COUNTER_FREQUENCY CONFIG_SC_TIMER_CLK #else #ifndef CONFIG_SYS_L2CACHE_OFF #define CONFIG_SYS_L2_PL310 diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 76c374af253..9f7d60f8fbd 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -16,7 +16,6 @@ /* Timer settings */ #define CONFIG_MXC_GPT_HCLK #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */ -#define COUNTER_FREQUENCY CONFIG_SC_TIMER_CLK
#define CONFIG_SYS_BOOTM_LEN 0x1000000
diff --git a/include/configs/owl-common.h b/include/configs/owl-common.h index 96453214eeb..fabbb01e0c8 100644 --- a/include/configs/owl-common.h +++ b/include/configs/owl-common.h @@ -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 */
/* diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index ef1fa2a5926..7f942888e74 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -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 */ diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h index 4c3da224c66..84cdd571962 100644 --- a/include/configs/p2771-0000.h +++ b/include/configs/p2771-0000.h @@ -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 diff --git a/include/configs/p3450-0000.h b/include/configs/p3450-0000.h index 1c962be8b8e..ec1a8634e71 100644 --- a/include/configs/p3450-0000.h +++ b/include/configs/p3450-0000.h @@ -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 */ diff --git a/include/configs/presidio_asic.h b/include/configs/presidio_asic.h index 3295d43ed67..1d526a73802 100644 --- a/include/configs/presidio_asic.h +++ b/include/configs/presidio_asic.h @@ -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 diff --git a/include/configs/px30_common.h b/include/configs/px30_common.h index 09923871571..a7e8dabff52 100644 --- a/include/configs/px30_common.h +++ b/include/configs/px30_common.h @@ -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 diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 00c453d739d..e690a8bbe75 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -11,7 +11,6 @@ #define CONFIG_SYS_CBSIZE 1024
#define CONFIG_ROCKCHIP_STIMER_BASE 0x200440a0 -#define COUNTER_FREQUENCY 24000000 #define CONFIG_SYS_HZ_CLOCK 24000000
#define CONFIG_SYS_INIT_SP_ADDR 0x60100000 diff --git a/include/configs/rk3128_common.h b/include/configs/rk3128_common.h index 97caceacfe6..4e62f8c114b 100644 --- a/include/configs/rk3128_common.h +++ b/include/configs/rk3128_common.h @@ -12,7 +12,6 @@ #define CONFIG_SYS_CBSIZE 1024
#define CONFIG_ROCKCHIP_STIMER_BASE 0x200440a0 -#define COUNTER_FREQUENCY 24000000 #define CONFIG_SYS_HZ_CLOCK 24000000
#define CONFIG_IRAM_BASE 0x10080000 diff --git a/include/configs/rk322x_common.h b/include/configs/rk322x_common.h index ef55ef0a83b..6830e9f94ff 100644 --- a/include/configs/rk322x_common.h +++ b/include/configs/rk322x_common.h @@ -12,7 +12,6 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */
#define CONFIG_ROCKCHIP_STIMER_BASE 0x110d0020 -#define COUNTER_FREQUENCY 24000000 #define CONFIG_SYS_HZ_CLOCK 24000000
#define CONFIG_SYS_INIT_SP_ADDR 0x61100000 diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 490da7cb23b..3e93bd72d16 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -14,7 +14,6 @@ #define CONFIG_SYS_CBSIZE 1024
#define CONFIG_ROCKCHIP_STIMER_BASE 0xff810020 -#define COUNTER_FREQUENCY 24000000 #define CONFIG_SYS_HZ_CLOCK 24000000
#ifdef CONFIG_SPL_ROCKCHIP_BACK_TO_BROM diff --git a/include/configs/rk3308_common.h b/include/configs/rk3308_common.h index 1664707ca65..cc7fd03d0de 100644 --- a/include/configs/rk3308_common.h +++ b/include/configs/rk3308_common.h @@ -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 */
diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h index c1e26a019b5..a40ef1290ed 100644 --- a/include/configs/rk3328_common.h +++ b/include/configs/rk3328_common.h @@ -11,7 +11,6 @@ #define CONFIG_IRAM_BASE 0xff090000
#define CONFIG_ROCKCHIP_STIMER_BASE 0xff1d0020 -#define COUNTER_FREQUENCY 24000000
#define CONFIG_SYS_CBSIZE 1024
diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index 8b239ca07da..c33b654990b 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_CBSIZE 1024
#define CONFIG_ROCKCHIP_STIMER_BASE 0xff830020 -#define COUNTER_FREQUENCY 24000000
#define CONFIG_IRAM_BASE 0xff8c0000
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index ed72c8bb6b1..53d1d0e9a6c 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -10,7 +10,6 @@
#define CONFIG_SYS_CBSIZE 1024
-#define COUNTER_FREQUENCY 24000000 #define CONFIG_ROCKCHIP_STIMER_BASE 0xff8680a0
#define CONFIG_IRAM_BASE 0xff8c0000 diff --git a/include/configs/rk3568_common.h b/include/configs/rk3568_common.h index 25d7c5cc8ff..9197d10bf2b 100644 --- a/include/configs/rk3568_common.h +++ b/include/configs/rk3568_common.h @@ -10,7 +10,6 @@
#define CONFIG_SYS_CBSIZE 1024
-#define COUNTER_FREQUENCY 24000000 #define CONFIG_ROCKCHIP_STIMER_BASE 0xfdd1c020
#define CONFIG_IRAM_BASE 0xfdcc0000 diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h index 764bc1bbf29..eb00e2b004b 100644 --- a/include/configs/salvator-x.h +++ b/include/configs/salvator-x.h @@ -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 diff --git a/include/configs/sdm845.h b/include/configs/sdm845.h index ba57323c74b..835f05d63e2 100644 --- a/include/configs/sdm845.h +++ b/include/configs/sdm845.h @@ -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" \ diff --git a/include/configs/silinux-ek874.h b/include/configs/silinux-ek874.h index a99babb48b0..346858c456c 100644 --- a/include/configs/silinux-ek874.h +++ b/include/configs/silinux-ek874.h @@ -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 */ diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index c288d548f5b..3447b8f17c2 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -108,11 +108,6 @@ #define CONFIG_SYS_NS16550_CLK 100000000 #define CONFIG_SYS_NS16550_MEM32
-/* - * Timer & watchdog configurations - */ -#define COUNTER_FREQUENCY 400000000 - /* * SDMMC configurations */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index a9031035d74..068340aa964 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -38,7 +38,6 @@ #endif
/* CPU */ -#define COUNTER_FREQUENCY 24000000
/* * The DRAM Base differs between some models. We cannot use macros for the diff --git a/include/configs/ten64.h b/include/configs/ten64.h index f82b1e0d212..04772c9e4ef 100644 --- a/include/configs/ten64.h +++ b/include/configs/ten64.h @@ -9,7 +9,6 @@
#include "ls1088a_common.h"
-#define COUNTER_FREQUENCY 25000000 /* 25MHz */
#define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 5000
diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index d07a8fe86bc..3537ba30e1f 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -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 diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h index c991bff0e88..14ea40bee3e 100644 --- a/include/configs/ulcb.h +++ b/include/configs/ulcb.h @@ -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 diff --git a/include/configs/vexpress_aemv8.h b/include/configs/vexpress_aemv8.h index 4f0ff239e68..0632b367cad 100644 --- a/include/configs/vexpress_aemv8.h +++ b/include/configs/vexpress_aemv8.h @@ -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) diff --git a/include/configs/xilinx_versal.h b/include/configs/xilinx_versal.h index 80e94113f07..e07314fd4e4 100644 --- a/include/configs/xilinx_versal.h +++ b/include/configs/xilinx_versal.h @@ -16,11 +16,6 @@
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE
-/* Generic Timer Definitions - setup in EL3. Setup by ATF for other cases */ -#if CONFIG_COUNTER_FREQUENCY -# define COUNTER_FREQUENCY CONFIG_COUNTER_FREQUENCY -#endif - /* Serial setup */ #define CONFIG_SYS_BAUDRATE_TABLE \ { 4800, 9600, 19200, 38400, 57600, 115200 } diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 1985a093256..8f91ed1c527 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -16,11 +16,6 @@
#define CONFIG_SYS_INIT_SP_ADDR CONFIG_SYS_TEXT_BASE
-/* Generic Timer Definitions - setup in EL3. Setup by ATF for other cases */ -#if !defined(COUNTER_FREQUENCY) -# define COUNTER_FREQUENCY 100000000 -#endif - /* Serial setup */ #define CONFIG_SYS_BAUDRATE_TABLE \ { 4800, 9600, 19200, 38400, 57600, 115200 }