aboutsummaryrefslogtreecommitdiff
path: root/fwu
diff options
context:
space:
mode:
authorDeepika Bhavnani <deepika.bhavnani@arm.com>2020-02-06 16:29:45 -0600
committerDeepika Bhavnani <deepika.bhavnani@arm.com>2020-02-11 09:22:12 -0600
commitc249d5e5cfbf2aa0f584001543c1d39953e1d6aa (patch)
treebae825efb76949c451188bb0e96de2ea1b120514 /fwu
parent1b5952a79ca1a6feb7b23372420285e886497852 (diff)
downloadtf-a-tests-c249d5e5cfbf2aa0f584001543c1d39953e1d6aa.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__.) 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 'fwu')
-rw-r--r--fwu/ns_bl1u/ns_bl1u.mk5
-rw-r--r--fwu/ns_bl2u/ns_bl2u.mk5
2 files changed, 2 insertions, 8 deletions
diff --git a/fwu/ns_bl1u/ns_bl1u.mk b/fwu/ns_bl1u/ns_bl1u.mk
index 7bdb0342..7e0e7679 100644
--- a/fwu/ns_bl1u/ns_bl1u.mk
+++ b/fwu/ns_bl1u/ns_bl1u.mk
@@ -70,9 +70,6 @@ $(eval $(call add_define,NS_BL1U_DEFINES,ENABLE_ASSERTIONS))
$(eval $(call add_define,NS_BL1U_DEFINES,FWU_BL_TEST))
$(eval $(call add_define,NS_BL1U_DEFINES,LOG_LEVEL))
$(eval $(call add_define,NS_BL1U_DEFINES,PLAT_${PLAT}))
-ifeq (${ARCH},aarch32)
- $(eval $(call add_define,NS_BL1U_DEFINES,AARCH32))
-else
- $(eval $(call add_define,NS_BL1U_DEFINES,AARCH64))
+ifeq (${ARCH},aarch64)
$(eval $(call add_define,NS_BL1U_DEFINES,ENABLE_PAUTH))
endif
diff --git a/fwu/ns_bl2u/ns_bl2u.mk b/fwu/ns_bl2u/ns_bl2u.mk
index 209e78b7..b6e616e8 100644
--- a/fwu/ns_bl2u/ns_bl2u.mk
+++ b/fwu/ns_bl2u/ns_bl2u.mk
@@ -65,9 +65,6 @@ $(eval $(call add_define,NS_BL2U_DEFINES,ENABLE_ASSERTIONS))
$(eval $(call add_define,NS_BL2U_DEFINES,FWU_BL_TEST))
$(eval $(call add_define,NS_BL2U_DEFINES,LOG_LEVEL))
$(eval $(call add_define,NS_BL2U_DEFINES,PLAT_${PLAT}))
-ifeq (${ARCH},aarch32)
- $(eval $(call add_define,NS_BL2U_DEFINES,AARCH32))
-else
- $(eval $(call add_define,NS_BL2U_DEFINES,AARCH64))
+ifeq (${ARCH},aarch64)
$(eval $(call add_define,NS_BL2U_DEFINES,ENABLE_PAUTH))
endif