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/qemu/qemu_bl2_setup.c | |
| 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/qemu/qemu_bl2_setup.c')
| -rw-r--r-- | plat/qemu/qemu_bl2_setup.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plat/qemu/qemu_bl2_setup.c b/plat/qemu/qemu_bl2_setup.c index b8ca895f..4c97c8dd 100644 --- a/plat/qemu/qemu_bl2_setup.c +++ b/plat/qemu/qemu_bl2_setup.c @@ -81,10 +81,10 @@ void bl2_platform_setup(void) /* TODO Initialize timer */ } -#ifdef AARCH32 -#define QEMU_CONFIGURE_BL2_MMU(...) qemu_configure_mmu_svc_mon(__VA_ARGS__) -#else +#ifdef __aarch64__ #define QEMU_CONFIGURE_BL2_MMU(...) qemu_configure_mmu_el1(__VA_ARGS__) +#else +#define QEMU_CONFIGURE_BL2_MMU(...) qemu_configure_mmu_svc_mon(__VA_ARGS__) #endif void bl2_plat_arch_setup(void) @@ -101,7 +101,7 @@ void bl2_plat_arch_setup(void) ******************************************************************************/ static uint32_t qemu_get_spsr_for_bl32_entry(void) { -#ifdef AARCH64 +#ifdef __aarch64__ /* * The Secure Payload Dispatcher service is responsible for * setting the SPSR prior to entry into the BL3-2 image. @@ -119,7 +119,7 @@ static uint32_t qemu_get_spsr_for_bl32_entry(void) static uint32_t qemu_get_spsr_for_bl33_entry(void) { uint32_t spsr; -#ifdef AARCH64 +#ifdef __aarch64__ unsigned int mode; /* Figure out what mode we enter the non-secure world in */ |