diff options
| author | Alexei Fedorov <Alexei.Fedorov@arm.com> | 2020-01-30 16:55:55 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-01-30 16:55:55 +0000 |
| commit | f69a5828b74ca27bd3872de9c8c6c5a107915c49 (patch) | |
| tree | 4b0d21b6ac7e97e2e90e56d28dc91b1e7202d366 /plat/arm | |
| parent | b7e0ed2c7190616e4e0dae2ee8e8b0cc1ce718e5 (diff) | |
| parent | f1be00da0b0acf90355558e01d5f8e1f79c0d481 (diff) | |
| download | arm-trusted-firmware-f69a5828b74ca27bd3872de9c8c6c5a107915c49.tar.gz | |
Merge "Use correct type when reading SCR register" into integration
Diffstat (limited to 'plat/arm')
| -rw-r--r-- | plat/arm/common/arm_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plat/arm/common/arm_common.c b/plat/arm/common/arm_common.c index 03d842a51..255e6b421 100644 --- a/plat/arm/common/arm_common.c +++ b/plat/arm/common/arm_common.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -173,7 +173,7 @@ unsigned int plat_get_syscnt_freq2(void) int plat_sdei_validate_entry_point(uintptr_t ep, unsigned int client_mode) { uint64_t par, pa; - uint32_t scr_el3; + u_register_t scr_el3; /* Doing Non-secure address translation requires SCR_EL3.NS set */ scr_el3 = read_scr_el3(); |