aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDeepika Bhavnani <deepika.bhavnani@arm.com>2020-02-06 16:29:45 -0600
committerDeepika Bhavnani <deepika.bhavnani@arm.com>2020-02-11 09:22:12 -0600
commitc249d5e5cfbf2aa0f584001543c1d39953e1d6aa (patch)
treebae825efb76949c451188bb0e96de2ea1b120514 /lib
parent1b5952a79ca1a6feb7b23372420285e886497852 (diff)
downloadtf-a-tests-c249d5e5cfbf2aa0f584001543c1d39953e1d6aa.tar.gz
Switch AARCH32/AARCH64 to __aarch64__
NOTE: AARCH32/AARCH64 macros are now deprecated in favor of __aarch64__. All common C compilers pre-define the same macros to signal which architecture the code is being compiled for: __arm__ for AArch32 (or earlier versions) and __aarch64__ for AArch64. There's no need for TF-A to define its own custom macros for this. In order to unify code with the export headers (which use __aarch64__ to avoid another dependency), let's deprecate the AARCH32 and AARCH64 macros and switch the code base over to the pre-defined standard macro. (Since it is somewhat unintuitive that __arm__ only means AArch32, let's standardize on only using __aarch64__.) NOTE: This change is based on below TFA commit https://github.com/ARM-software/arm-trusted-firmware/commit/402b3cf8766fe2cb4ae462f7ee7761d08a1ba56c Signed-off-by: Deepika Bhavnani <deepika.bhavnani@arm.com> Change-Id: If2c3dbaeb01d4a9d8cfd95d906e5eaf4ae94417f
Diffstat (limited to 'lib')
-rw-r--r--lib/xlat_tables_v2/xlat_tables_context.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/xlat_tables_v2/xlat_tables_context.c b/lib/xlat_tables_v2/xlat_tables_context.c
index 9b481a18d..0f3bab90c 100644
--- a/lib/xlat_tables_v2/xlat_tables_context.c
+++ b/lib/xlat_tables_v2/xlat_tables_context.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2017-2020, ARM Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -134,7 +134,7 @@ int xlat_change_mem_attributes(uintptr_t base_va, size_t size, uint32_t attr)
#define MAX_PHYS_ADDR tf_xlat_ctx.max_pa
#endif
-#ifdef AARCH32
+#ifndef __aarch64__
void enable_mmu_svc_mon(unsigned int flags)
{
@@ -178,4 +178,4 @@ void enable_mmu_el3(unsigned int flags)
enable_mmu_direct_el3(flags);
}
-#endif /* AARCH32 */
+#endif /* !__aarch64__ */