diff options
| author | Mark Dykes <mardyk01@review.trustedfirmware.org> | 2020-01-23 16:11:27 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-01-23 16:11:27 +0000 |
| commit | 4302e045fd435868be6c24a1da842b512d0ab315 (patch) | |
| tree | c846534fa9000a2728bb7af717d871c70cb84474 /lib | |
| parent | 0908c31a3ecbcff98d184540844f6a498b13138f (diff) | |
| parent | 3b5454efacb481817efee8ac3bbd6d20cdd50153 (diff) | |
| download | platform_external_arm-trusted-firmware-4302e045fd435868be6c24a1da842b512d0ab315.tar.gz platform_external_arm-trusted-firmware-4302e045fd435868be6c24a1da842b512d0ab315.tar.bz2 platform_external_arm-trusted-firmware-4302e045fd435868be6c24a1da842b512d0ab315.zip | |
Merge "Revert "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, 2 insertions, 3 deletions
diff --git a/lib/el3_runtime/aarch64/cpu_data.S b/lib/el3_runtime/aarch64/cpu_data.S index 2392d6b90..2edf22559 100644 --- a/lib/el3_runtime/aarch64/cpu_data.S +++ b/lib/el3_runtime/aarch64/cpu_data.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2020, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2014-2016, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -41,8 +41,7 @@ endfunc init_cpu_data_ptr func _cpu_data_by_index mov_imm x1, CPU_DATA_SIZE mul x0, x0, x1 - adrp x1, percpu_data - add x1, x1, :lo12:percpu_data + adr x1, percpu_data add x0, x0, x1 ret endfunc _cpu_data_by_index |