diff options
author | Deepika Bhavnani <deepika.bhavnani@arm.com> | 2020-02-06 16:29:45 -0600 |
---|---|---|
committer | Deepika Bhavnani <deepika.bhavnani@arm.com> | 2020-02-11 09:22:12 -0600 |
commit | c249d5e5cfbf2aa0f584001543c1d39953e1d6aa (patch) | |
tree | bae825efb76949c451188bb0e96de2ea1b120514 /plat/arm/fvp | |
parent | 1b5952a79ca1a6feb7b23372420285e886497852 (diff) |
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 'plat/arm/fvp')
-rw-r--r-- | plat/arm/fvp/fvp_mem_prot.c | 4 | ||||
-rw-r--r-- | plat/arm/fvp/include/platform_def.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plat/arm/fvp/fvp_mem_prot.c b/plat/arm/fvp/fvp_mem_prot.c index 6a7d651..2682ba9 100644 --- a/plat/arm/fvp/fvp_mem_prot.c +++ b/plat/arm/fvp/fvp_mem_prot.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, Arm Limited. All rights reserved. + * Copyright (c) 2018-2020, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -14,7 +14,7 @@ static const mem_region_t fvp_ram_ranges[] = { {NS_IMAGE_LIMIT, 1 << ONE_GB_SHIFT}, -#ifdef AARCH64 +#ifdef __aarch64__ {FVP_DRAM2_BASE, 1 << ONE_GB_SHIFT}, #endif }; diff --git a/plat/arm/fvp/include/platform_def.h b/plat/arm/fvp/include/platform_def.h index 4f64079..27f4851 100644 --- a/plat/arm/fvp/include/platform_def.h +++ b/plat/arm/fvp/include/platform_def.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019, Arm Limited. All rights reserved. + * Copyright (c) 2018-2020, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -19,7 +19,7 @@ /******************************************************************************* * Platform binary types for linking ******************************************************************************/ -#ifndef AARCH32 +#ifdef __aarch64__ #define PLATFORM_LINKER_FORMAT "elf64-littleaarch64" #define PLATFORM_LINKER_ARCH aarch64 #else @@ -176,7 +176,7 @@ /******************************************************************************* * Platform specific page table and MMU setup constants ******************************************************************************/ -#if AARCH64 +#ifdef __aarch64__ #define PLAT_PHY_ADDR_SPACE_SIZE (ULL(1) << 34) #define PLAT_VIRT_ADDR_SPACE_SIZE (ULL(1) << 34) #else |