mirrors/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-08-14 16:37:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Define plat_get_syscnt_freq2() unconditionally for ARM platforms

Browse Source 
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
This commit is contained in:
Soby Mathew 2016-07-07 10:03:21 +01:00
parent 48ac1df946
commit a4beaaffed
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plat/arm/common/arm_common.c
View File

@ -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)
#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);