From 3b5454efacb481817efee8ac3bbd6d20cdd50153 Mon Sep 17 00:00:00 2001 From: Mark Dykes Date: Wed, 22 Jan 2020 21:52:44 +0000 Subject: Revert "Changes necessary to support SEPARATE_NOBITS_REGION feature" This reverts commit 76d84cbc60ab3ee7bf40d53487f85ed7417bdcc3. Change-Id: I867af7af3d9f5e568101f79b9ebea578e5cb2a4b --- lib/el3_runtime/aarch64/cpu_data.S | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'lib') 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 -- cgit v1.2.3