diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-10-21 12:09:52 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-10-21 12:09:52 +0000 |
| commit | 942bb52e99f317579256b5d146b43221b1788fac (patch) | |
| tree | babe58b92600f291d9d1e1efffc7c216d5547b6f | |
| parent | 879389edd6c0a89854a9c222541c6caba92e7aaf (diff) | |
| parent | 89632e6aeba8414c1901eecb5d885363c73448f0 (diff) | |
Merge "Replace deprecated __ASSEMBLY__ macro with __ASSEMBLER__" into integration
| -rw-r--r-- | include/lib/cpus/aarch64/cortex_a53.h | 4 | ||||
| -rw-r--r-- | include/lib/cpus/aarch64/cortex_a73.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/lib/cpus/aarch64/cortex_a53.h b/include/lib/cpus/aarch64/cortex_a53.h index ea7181ed..6fe67a9f 100644 --- a/include/lib/cpus/aarch64/cortex_a53.h +++ b/include/lib/cpus/aarch64/cortex_a53.h @@ -76,8 +76,8 @@ /******************************************************************************* * Helper function to access a53_cpuectlr_el1 register on Cortex-A53 CPUs ******************************************************************************/ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ DEFINE_RENAME_SYSREG_RW_FUNCS(a53_cpuectlr_el1, CORTEX_A53_ECTLR_EL1) -#endif +#endif /* __ASSEMBLER__ */ #endif /* CORTEX_A53_H */ diff --git a/include/lib/cpus/aarch64/cortex_a73.h b/include/lib/cpus/aarch64/cortex_a73.h index fb4f1ec0..271a3334 100644 --- a/include/lib/cpus/aarch64/cortex_a73.h +++ b/include/lib/cpus/aarch64/cortex_a73.h @@ -38,8 +38,8 @@ /******************************************************************************* * Helper function to access a73_cpuectlr_el1 register on Cortex-A73 CPUs ******************************************************************************/ -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLER__ DEFINE_RENAME_SYSREG_RW_FUNCS(a73_cpuectlr_el1, CORTEX_A73_CPUECTLR_EL1) -#endif +#endif /* __ASSEMBLER__ */ #endif /* CORTEX_A73_H */ |