diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2020-02-04 16:37:09 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-02-04 16:37:09 +0000 |
| commit | 9eac8e958e363b9c2772f1c1ff93ba3530b1fbad (patch) | |
| tree | 5000fb558a1dd59eed9a0bcdc155a68be1208841 /lib | |
| parent | 44e3424e34593cb9c363edca33ecd8a648a0d75e (diff) | |
| parent | 0c1f197aa12ba19046671c4741be03aa54a90866 (diff) | |
| download | platform_external_arm-trusted-firmware-9eac8e958e363b9c2772f1c1ff93ba3530b1fbad.tar.gz platform_external_arm-trusted-firmware-9eac8e958e363b9c2772f1c1ff93ba3530b1fbad.tar.bz2 platform_external_arm-trusted-firmware-9eac8e958e363b9c2772f1c1ff93ba3530b1fbad.zip | |
Merge changes from topic "mp/separate_nobits" into integration
* changes:
plat/arm: Add support for SEPARATE_NOBITS_REGION
Changes necessary to support SEPARATE_NOBITS_REGION feature
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/el3_runtime/aarch64/cpu_data.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/el3_runtime/aarch64/cpu_data.S b/lib/el3_runtime/aarch64/cpu_data.S index 2edf22559..2392d6b90 100644 --- a/lib/el3_runtime/aarch64/cpu_data.S +++ b/lib/el3_runtime/aarch64/cpu_data.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -41,7 +41,8 @@ endfunc init_cpu_data_ptr func _cpu_data_by_index mov_imm x1, CPU_DATA_SIZE mul x0, x0, x1 - adr x1, percpu_data + adrp x1, percpu_data + add x1, x1, :lo12:percpu_data add x0, x0, x1 ret endfunc _cpu_data_by_index |