Commit a4beaaff authored by Soby Mathew's avatar Soby Mathew
Browse files

Define `plat_get_syscnt_freq2()` unconditionally for ARM platforms

Previously the definition of `plat_get_syscnt_freq2()` in `arm_common.c` was
conditionally defined based on the ERROR_DEPRECATED flag. This patch makes
this function available irrespective of the flag and removes the deprecated
`plat_get_syscnt_freq()` definition.

Change-Id: I250ca787ca1b5e867096c6ba8f2bb444db44c97b
parent 48ac1df9
...@@ -46,8 +46,6 @@ extern const mmap_region_t plat_arm_mmap[]; ...@@ -46,8 +46,6 @@ extern const mmap_region_t plat_arm_mmap[];
* conflicts with the definition in plat/common. */ * conflicts with the definition in plat/common. */
#if ERROR_DEPRECATED #if ERROR_DEPRECATED
#pragma weak plat_get_syscnt_freq2 #pragma weak plat_get_syscnt_freq2
#else
#pragma weak plat_get_syscnt_freq
#endif #endif
/* /*
...@@ -187,15 +185,9 @@ const mmap_region_t *plat_arm_get_mmap(void) ...@@ -187,15 +185,9 @@ const mmap_region_t *plat_arm_get_mmap(void)
#ifdef ARM_SYS_CNTCTL_BASE #ifdef ARM_SYS_CNTCTL_BASE
#if ERROR_DEPRECATED
unsigned int plat_get_syscnt_freq2(void) unsigned int plat_get_syscnt_freq2(void)
{ {
unsigned int counter_base_frequency; unsigned int counter_base_frequency;
#else
unsigned long long plat_get_syscnt_freq(void)
{
unsigned long long counter_base_frequency;
#endif /* ERROR_DEPRECATED */
/* Read the frequency from Frequency modes table */ /* Read the frequency from Frequency modes table */
counter_base_frequency = mmio_read_32(ARM_SYS_CNTCTL_BASE + CNTFID_OFF); counter_base_frequency = mmio_read_32(ARM_SYS_CNTCTL_BASE + CNTFID_OFF);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment