diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2016-07-07 10:03:21 +0100 |
|---|---|---|
| committer | Soby Mathew <soby.mathew@arm.com> | 2016-07-19 10:19:08 +0100 |
| commit | a4beaaffedb53f6d8bcc199aedaddc9f5c3eec7c (patch) | |
| tree | ea4b3014b3cd194cb5b2e7a8e8d9824cdcb1d8c6 /plat/arm/common | |
| parent | 48ac1df9460a046f925545bc1c94d93bd3506509 (diff) | |
| download | arm-trusted-firmware-a4beaaffedb53f6d8bcc199aedaddc9f5c3eec7c.tar.gz | |
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
Diffstat (limited to 'plat/arm/common')
| -rw-r--r-- | plat/arm/common/arm_common.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/plat/arm/common/arm_common.c b/plat/arm/common/arm_common.c index 03e44f42..93355fe4 100644 --- a/plat/arm/common/arm_common.c +++ b/plat/arm/common/arm_common.c @@ -46,8 +46,6 @@ extern const mmap_region_t plat_arm_mmap[]; * conflicts with the definition in plat/common. */ #if ERROR_DEPRECATED #pragma weak plat_get_syscnt_freq2 -#else -#pragma weak plat_get_syscnt_freq #endif /* @@ -187,15 +185,9 @@ const mmap_region_t *plat_arm_get_mmap(void) #ifdef ARM_SYS_CNTCTL_BASE -#if ERROR_DEPRECATED unsigned int plat_get_syscnt_freq2(void) { 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 */ counter_base_frequency = mmio_read_32(ARM_SYS_CNTCTL_BASE + CNTFID_OFF); |