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 /bl1 | |
| 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 'bl1')
| -rw-r--r-- | bl1/bl1_fwu.c | 8 | ||||
| -rw-r--r-- | bl1/bl1_main.c | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/bl1/bl1_fwu.c b/bl1/bl1_fwu.c index 76a43753..d222b9c5 100644 --- a/bl1/bl1_fwu.c +++ b/bl1/bl1_fwu.c @@ -520,7 +520,7 @@ static int bl1_fwu_image_execute(unsigned int image_id, INFO("BL1-FWU: Executing Secure image\n"); -#ifdef AARCH64 +#ifdef __aarch64__ /* Save NS-EL1 system registers. */ cm_el1_sysregs_context_save(NON_SECURE); #endif @@ -531,7 +531,7 @@ static int bl1_fwu_image_execute(unsigned int image_id, /* Update the secure image id. */ sec_exec_image_id = image_id; -#ifdef AARCH64 +#ifdef __aarch64__ *handle = cm_get_context(SECURE); #else *handle = smc_get_ctx(SECURE); @@ -584,7 +584,7 @@ static register_t bl1_fwu_image_resume(register_t image_param, INFO("BL1-FWU: Resuming %s world context\n", (resume_sec_state == SECURE) ? "secure" : "normal"); -#ifdef AARCH64 +#ifdef __aarch64__ /* Save the EL1 system registers of calling world. */ cm_el1_sysregs_context_save(caller_sec_state); @@ -641,7 +641,7 @@ static int bl1_fwu_sec_image_done(void **handle, unsigned int flags) sec_exec_image_id = INVALID_IMAGE_ID; INFO("BL1-FWU: Resuming Normal world context\n"); -#ifdef AARCH64 +#ifdef __aarch64__ /* * Secure world is done so no need to save the context. * Just restore the Non-Secure context. diff --git a/bl1/bl1_main.c b/bl1/bl1_main.c index fce14f55..d44b46dc 100644 --- a/bl1/bl1_main.c +++ b/bl1/bl1_main.c @@ -59,7 +59,7 @@ void bl1_setup(void) /* Perform early platform-specific setup */ bl1_early_platform_setup(); -#ifdef AARCH64 +#ifdef __aarch64__ /* * Update pointer authentication key before the MMU is enabled. It is * saved in the rodata section, that can be writen before enabling the @@ -67,7 +67,7 @@ void bl1_setup(void) * in the early platform setup. */ bl_handle_pauth(); -#endif /* AARCH64 */ +#endif /* __aarch64__ */ /* Perform late platform-specific setup */ bl1_plat_arch_setup(); @@ -97,10 +97,10 @@ void bl1_main(void) /* * Ensure that MMU/Caches and coherency are turned on */ -#ifdef AARCH32 - val = read_sctlr(); -#else +#ifdef __aarch64__ val = read_sctlr_el3(); +#else + val = read_sctlr(); #endif assert(val & SCTLR_M_BIT); assert(val & SCTLR_C_BIT); @@ -198,11 +198,11 @@ static void bl1_load_bl2(void) ******************************************************************************/ void bl1_print_next_bl_ep_info(const entry_point_info_t *bl_ep_info) { -#ifdef AARCH32 - NOTICE("BL1: Booting BL32\n"); -#else +#ifdef __aarch64__ NOTICE("BL1: Booting BL31\n"); -#endif /* AARCH32 */ +#else + NOTICE("BL1: Booting BL32\n"); +#endif /* __aarch64__ */ print_entry_point_info(bl_ep_info); } |