diff options
| author | Julius Werner <jwerner@chromium.org> | 2019-07-09 14:02:43 -0700 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2019-08-01 13:45:03 -0700 |
| commit | 402b3cf8766fe2cb4ae462f7ee7761d08a1ba56c (patch) | |
| tree | bf3de0c17a38822188847b7bdaad7f70441637b0 /plat/common | |
| parent | d5dfdeb65ff5b7f24dded201d2945c7b74565ce8 (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__.)
Change-Id: Ic77de4b052297d77f38fc95f95f65a8ee70cf200
Signed-off-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'plat/common')
| -rw-r--r-- | plat/common/plat_gicv3.c | 2 | ||||
| -rw-r--r-- | plat/common/plat_psci_common.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plat/common/plat_gicv3.c b/plat/common/plat_gicv3.c index f5ed6fc9..4a8a7eef 100644 --- a/plat/common/plat_gicv3.c +++ b/plat/common/plat_gicv3.c @@ -300,7 +300,7 @@ unsigned int plat_ic_get_interrupt_id(unsigned int raw) #pragma weak plat_ic_end_of_interrupt /* In AArch32, the secure group1 interrupts are targeted to Secure PL1 */ -#ifdef AARCH32 +#ifndef __aarch64__ #define IS_IN_EL1() IS_IN_SECURE() #endif diff --git a/plat/common/plat_psci_common.c b/plat/common/plat_psci_common.c index 1a29d9ca..16bec797 100644 --- a/plat/common/plat_psci_common.c +++ b/plat/common/plat_psci_common.c @@ -20,10 +20,10 @@ #define MHZ_TICKS_PER_SEC 1000000U /* Maximum time-stamp value read from architectural counters */ -#ifdef AARCH32 -#define MAX_TS UINT32_MAX -#else +#ifdef __aarch64__ #define MAX_TS UINT64_MAX +#else +#define MAX_TS UINT32_MAX #endif /* Following are used as ID's to capture time-stamp */ |