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/hisilicon | |
parent | d5dfdeb65ff5b7f24dded201d2945c7b74565ce8 (diff) | |
download | trusted-firmware-a-402b3cf8766fe2cb4ae462f7ee7761d08a1ba56c.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__.)
Change-Id: Ic77de4b052297d77f38fc95f95f65a8ee70cf200
Signed-off-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'plat/hisilicon')
-rw-r--r-- | plat/hisilicon/hikey/hikey_bl2_setup.c | 6 | ||||
-rw-r--r-- | plat/hisilicon/hikey/include/hikey_layout.h | 2 | ||||
-rw-r--r-- | plat/hisilicon/hikey960/hikey960_bl2_setup.c | 6 | ||||
-rw-r--r-- | plat/hisilicon/hikey960/include/platform_def.h | 2 | ||||
-rw-r--r-- | plat/hisilicon/poplar/bl2_plat_setup.c | 6 | ||||
-rw-r--r-- | plat/hisilicon/poplar/include/platform_def.h | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/plat/hisilicon/hikey/hikey_bl2_setup.c b/plat/hisilicon/hikey/hikey_bl2_setup.c index c57fea90d3..2f96efcdb3 100644 --- a/plat/hisilicon/hikey/hikey_bl2_setup.c +++ b/plat/hisilicon/hikey/hikey_bl2_setup.c @@ -77,7 +77,7 @@ uint32_t hikey_get_spsr_for_bl32_entry(void) /******************************************************************************* * Gets SPSR for BL33 entry ******************************************************************************/ -#ifndef AARCH32 +#ifdef __aarch64__ uint32_t hikey_get_spsr_for_bl33_entry(void) { unsigned int mode; @@ -112,7 +112,7 @@ uint32_t hikey_get_spsr_for_bl33_entry(void) SPSR_E_LITTLE, DISABLE_ALL_EXCEPTIONS); return spsr; } -#endif /* AARCH32 */ +#endif /* __aarch64__ */ int hikey_bl2_handle_post_image_load(unsigned int image_id) { @@ -125,7 +125,7 @@ int hikey_bl2_handle_post_image_load(unsigned int image_id) assert(bl_mem_params); switch (image_id) { -#ifdef AARCH64 +#ifdef __aarch64__ case BL32_IMAGE_ID: #ifdef SPD_opteed pager_mem_params = get_bl_mem_params_node(BL32_EXTRA1_IMAGE_ID); diff --git a/plat/hisilicon/hikey/include/hikey_layout.h b/plat/hisilicon/hikey/include/hikey_layout.h index a87648ed25..4b8dc53545 100644 --- a/plat/hisilicon/hikey/include/hikey_layout.h +++ b/plat/hisilicon/hikey/include/hikey_layout.h @@ -113,7 +113,7 @@ #endif /* BL32 is mandatory in AArch32 */ -#ifndef AARCH32 +#ifdef __aarch64__ #ifdef SPD_none #undef BL32_BASE #endif /* SPD_none */ diff --git a/plat/hisilicon/hikey960/hikey960_bl2_setup.c b/plat/hisilicon/hikey960/hikey960_bl2_setup.c index 7102de85b0..fc9ddab0df 100644 --- a/plat/hisilicon/hikey960/hikey960_bl2_setup.c +++ b/plat/hisilicon/hikey960/hikey960_bl2_setup.c @@ -168,7 +168,7 @@ uint32_t hikey960_get_spsr_for_bl32_entry(void) /******************************************************************************* * Gets SPSR for BL33 entry ******************************************************************************/ -#ifndef AARCH32 +#ifdef __aarch64__ uint32_t hikey960_get_spsr_for_bl33_entry(void) { unsigned int mode; @@ -203,7 +203,7 @@ uint32_t hikey960_get_spsr_for_bl33_entry(void) SPSR_E_LITTLE, DISABLE_ALL_EXCEPTIONS); return spsr; } -#endif /* AARCH32 */ +#endif /* __aarch64__ */ int hikey960_bl2_handle_post_image_load(unsigned int image_id) { @@ -216,7 +216,7 @@ int hikey960_bl2_handle_post_image_load(unsigned int image_id) assert(bl_mem_params); switch (image_id) { -#ifdef AARCH64 +#ifdef __aarch64__ case BL32_IMAGE_ID: #ifdef SPD_opteed pager_mem_params = get_bl_mem_params_node(BL32_EXTRA1_IMAGE_ID); diff --git a/plat/hisilicon/hikey960/include/platform_def.h b/plat/hisilicon/hikey960/include/platform_def.h index 7c3c10238d..f6edad6685 100644 --- a/plat/hisilicon/hikey960/include/platform_def.h +++ b/plat/hisilicon/hikey960/include/platform_def.h @@ -95,7 +95,7 @@ #endif /* BL32 is mandatory in AArch32 */ -#ifndef AARCH32 +#ifdef __aarch64__ #ifdef SPD_none #undef BL32_BASE #endif /* SPD_none */ diff --git a/plat/hisilicon/poplar/bl2_plat_setup.c b/plat/hisilicon/poplar/bl2_plat_setup.c index 11403b07fe..cc9d9754ec 100644 --- a/plat/hisilicon/poplar/bl2_plat_setup.c +++ b/plat/hisilicon/poplar/bl2_plat_setup.c @@ -54,7 +54,7 @@ uint32_t poplar_get_spsr_for_bl32_entry(void) /******************************************************************************* * Gets SPSR for BL33 entry ******************************************************************************/ -#ifndef AARCH32 +#ifdef __aarch64__ uint32_t poplar_get_spsr_for_bl33_entry(void) { unsigned long el_status; @@ -93,7 +93,7 @@ uint32_t poplar_get_spsr_for_bl33_entry(void) SPSR_E_LITTLE, DISABLE_ALL_EXCEPTIONS); return spsr; } -#endif /* AARCH32 */ +#endif /* __aarch64__ */ int poplar_bl2_handle_post_image_load(unsigned int image_id) { @@ -107,7 +107,7 @@ int poplar_bl2_handle_post_image_load(unsigned int image_id) assert(bl_mem_params); switch (image_id) { -#ifdef AARCH64 +#ifdef __aarch64__ case BL32_IMAGE_ID: #ifdef SPD_opteed pager_mem_params = get_bl_mem_params_node(BL32_EXTRA1_IMAGE_ID); diff --git a/plat/hisilicon/poplar/include/platform_def.h b/plat/hisilicon/poplar/include/platform_def.h index 8f7a1559b2..9783f8d2da 100644 --- a/plat/hisilicon/poplar/include/platform_def.h +++ b/plat/hisilicon/poplar/include/platform_def.h @@ -107,7 +107,7 @@ #endif /* BL32 is mandatory in AArch32 */ -#ifndef AARCH32 +#ifdef __aarch64__ #ifdef SPD_none #undef BL32_BASE #endif /* SPD_none */ |