Skip to content

GitLab

Commit 73a3db71 authored by Madhukar Pappireddy's avatar Madhukar Pappireddy Committed by TrustedFirmware Code Review
Browse files

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

parents 906116f8 7f2d23d9
Show whitespace changes
Inline Side-by-side
plat/arm/common/arm_common.c
View file @ 73a3db71
/* /*
* 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 * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -151,10 +151,10 @@ void arm_configure_sys_timer(void) ...@@ -151,10 +151,10 @@ void arm_configure_sys_timer(void)
*/ */
mmio_write_32(ARM_SYS_TIMCTL_BASE + CNTCTLBASE_CNTFRQ, freq_val); 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. * 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 * follow ARM ARM in that the value updated in CNTFRQ is not
* reflected in CNTBASEN_CNTFRQ. Hence update the value manually. * reflected in CNTBASEN_CNTFRQ. Hence update the value manually.
*/ */
......
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