diff options
| author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-01-22 21:50:19 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-01-22 21:50:19 +0000 |
| commit | aa386f7a2f354925a8a0ee219b9931bac493085f (patch) | |
| tree | ef71a259ea0ba519ef54dc5944c69e85d67bed64 /lib | |
| parent | d81e38f66e232ddd2590f50cafe88eef52d4a752 (diff) | |
| parent | 76d84cbc60ab3ee7bf40d53487f85ed7417bdcc3 (diff) | |
| download | platform_external_arm-trusted-firmware-aa386f7a2f354925a8a0ee219b9931bac493085f.tar.gz platform_external_arm-trusted-firmware-aa386f7a2f354925a8a0ee219b9931bac493085f.tar.bz2 platform_external_arm-trusted-firmware-aa386f7a2f354925a8a0ee219b9931bac493085f.zip | |
Merge "Changes necessary to support SEPARATE_NOBITS_REGION feature" into integration
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 |