diff options
| author | Julius Werner <jwerner@chromium.org> | 2019-07-09 13:49:11 -0700 |
|---|---|---|
| committer | Julius Werner <jwerner@chromium.org> | 2019-08-01 13:14:12 -0700 |
| commit | d5dfdeb65ff5b7f24dded201d2945c7b74565ce8 (patch) | |
| tree | c6f6607a5bab02c7497689e043db50fad88158f8 /include/drivers/arm/cci.h | |
| parent | f61469e532c05bfe0de06620e8762db18414a357 (diff) | |
| download | platform_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 'include/drivers/arm/cci.h')
| -rw-r--r-- | include/drivers/arm/cci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/drivers/arm/cci.h b/include/drivers/arm/cci.h index c5ddcfd44..5aea95a0c 100644 --- a/include/drivers/arm/cci.h +++ b/include/drivers/arm/cci.h @@ -100,7 +100,7 @@ #define SLAVE_IF_UNUSED -1 -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ #include <stdint.h> @@ -121,5 +121,5 @@ void cci_init(uintptr_t base, const int *map, unsigned int num_cci_masters); void cci_enable_snoop_dvm_reqs(unsigned int master_id); void cci_disable_snoop_dvm_reqs(unsigned int master_id); -#endif /* __ASSEMBLY__ */ +#endif /* __ASSEMBLER__ */ #endif /* CCI_H */ |