Revert "Changes necessary to support SEPARATE_NOBITS_REGION feature"
This reverts commit 76d84cbc60ab3ee7bf40d53487f85ed7417bdcc3.
Change-Id: I867af7af3d9f5e568101f79b9ebea578e5cb2a4b
diff --git a/bl31/aarch64/bl31_entrypoint.S b/bl31/aarch64/bl31_entrypoint.S
index 2d672dd..665a05e 100644
--- a/bl31/aarch64/bl31_entrypoint.S
+++ b/bl31/aarch64/bl31_entrypoint.S
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2020, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -110,17 +110,13 @@
* caches and participate in coherency.
* --------------------------------------------------------------------
*/
- adrp x0, __DATA_START__
- add x0, x0, :lo12:__DATA_START__
- adrp x1, __DATA_END__
- add x1, x1, :lo12:__DATA_END__
+ adr x0, __DATA_START__
+ adr x1, __DATA_END__
sub x1, x1, x0
bl clean_dcache_range
- adrp x0, __BSS_START__
- add x0, x0, :lo12:__BSS_START__
- adrp x1, __BSS_END__
- add x1, x1, :lo12:__BSS_END__
+ adr x0, __BSS_START__
+ adr x1, __BSS_END__
sub x1, x1, x0
bl clean_dcache_range