aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/arm
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2019-07-09 13:49:11 -0700
committerJulius Werner <jwerner@chromium.org>2019-08-01 13:14:12 -0700
commitd5dfdeb65ff5b7f24dded201d2945c7b74565ce8 (patch)
treec6f6607a5bab02c7497689e043db50fad88158f8 /drivers/arm
parentf61469e532c05bfe0de06620e8762db18414a357 (diff)
downloadplatform_external_arm-trusted-firmware-d5dfdeb65ff5b7f24dded201d2945c7b74565ce8.tar.gz
platform_external_arm-trusted-firmware-d5dfdeb65ff5b7f24dded201d2945c7b74565ce8.tar.bz2
platform_external_arm-trusted-firmware-d5dfdeb65ff5b7f24dded201d2945c7b74565ce8.zip
Replace __ASSEMBLY__ with compiler-builtin __ASSEMBLER__
NOTE: __ASSEMBLY__ macro is now deprecated in favor of __ASSEMBLER__. All common C compilers predefine a macro called __ASSEMBLER__ when preprocessing a .S file. There is no reason for TF-A to define it's own __ASSEMBLY__ macro for this purpose instead. To unify code with the export headers (which use __ASSEMBLER__ to avoid one extra dependency), let's deprecate __ASSEMBLY__ and switch the code base over to the predefined standard. Change-Id: Id7d0ec8cf330195da80499c68562b65cb5ab7417 Signed-off-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'drivers/arm')
-rw-r--r--drivers/arm/css/sds/sds_private.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/arm/css/sds/sds_private.h b/drivers/arm/css/sds/sds_private.h
index 2101dd049..d801a04dd 100644
--- a/drivers/arm/css/sds/sds_private.h
+++ b/drivers/arm/css/sds/sds_private.h
@@ -58,7 +58,7 @@
#define SDS_REGION_REGIONSIZE_OFFSET 0x4
#define SDS_REGION_DESC_SIZE 0x8
-#ifndef __ASSEMBLY__
+#ifndef __ASSEMBLER__
#include <stddef.h>
#include <stdint.h>
@@ -95,6 +95,6 @@ typedef struct region_descriptor {
& SDS_REGION_SCH_VERSION_MASK)
#define GET_SDS_REGION_SIZE(region) ((((region_desc_t *)(region))->reg[1]))
-#endif /* __ASSEMBLY__ */
+#endif /* __ASSEMBLER__ */
#endif /* SDS_PRIVATE_H */