Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-23 13:36:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(morello): initialise CNTFRQ in Non Secure CNTBaseN" into integration

Browse source
This commit is contained in:
Madhukar Pappireddy 2021-06-01 17:07:45 +02:00 • committed by TrustedFirmware Code Review
commit 73a3db718c
1 changed files with 3 additions and 3 deletions

6
plat/arm/common/arm_common.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved.
* Copyright (c) 2015-2021, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -151,10 +151,10 @@ void arm_configure_sys_timer(void)
*/
mmio_write_32(ARM_SYS_TIMCTL_BASE + CNTCTLBASE_CNTFRQ, freq_val);
#if defined(PLAT_juno) || defined(PLAT_n1sdp)
#if defined(PLAT_juno) || defined(PLAT_n1sdp) || defined(PLAT_morello)
/*
* Initialize CNTFRQ register in Non-secure CNTBase frame.
* This is only required for Juno and N1SDP, because they do not
* This is required for Juno, N1SDP and Morello because they do not
* follow ARM ARM in that the value updated in CNTFRQ is not
* reflected in CNTBASEN_CNTFRQ. Hence update the value manually.
*/