diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2020-04-01 14:20:58 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2020-04-02 14:13:05 +0900 |
| commit | 9cefb4b194fe682fd45ece845e55a1f63e5d8a56 (patch) | |
| tree | 1fc2da8019e70467f92cb80e99a69c9ed5224db9 /include | |
| parent | 61903ad7779994a5b04104006c86c5f3db2576c2 (diff) | |
| download | platform_external_arm-trusted-firmware-9cefb4b194fe682fd45ece845e55a1f63e5d8a56.tar.gz platform_external_arm-trusted-firmware-9cefb4b194fe682fd45ece845e55a1f63e5d8a56.tar.bz2 platform_external_arm-trusted-firmware-9cefb4b194fe682fd45ece845e55a1f63e5d8a56.zip | |
Pass more -D options to BL*_CPPFLAGS instead of BL*_CFLAGS
Commit d5e97a1d2c79 ("Build: define IMAGE_AT_EL1 or IMAGE_AT_EL3
globally for C files") does not have commit 848a7e8ce1d9 ("Build:
introduce per-BL CPPFLAGS and ASFLAGS") as an ancestor because
they were pulled almost at the same time.
This is a follow-up conversion to be consistent with commit
11a3c5ee7325 ("plat: pass -D option to BL*_CPPFLAGS instead of
BL*_CFLAGS").
With this change, the command line option, IMAGE_AT_EL3, will be
passed to .S files as well.
I remove the definition in include/lib/cpus/aarch64/cpu_macros.S
Otherwise, the following error would happen.
include/lib/cpus/aarch64/cpu_macros.S:29:0: error: "IMAGE_AT_EL3" redefined [-Werror]
Change-Id: I943c8f22356483c2ae3c57b515c69243a8fa6889
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/lib/cpus/aarch64/cpu_macros.S | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/lib/cpus/aarch64/cpu_macros.S b/include/lib/cpus/aarch64/cpu_macros.S index c83824d77..92891ce38 100644 --- a/include/lib/cpus/aarch64/cpu_macros.S +++ b/include/lib/cpus/aarch64/cpu_macros.S @@ -25,10 +25,6 @@ /* Word size for 64-bit CPUs */ #define CPU_WORD_SIZE 8 -#if defined(IMAGE_BL1) || defined(IMAGE_BL31) ||(defined(IMAGE_BL2) && BL2_AT_EL3) -#define IMAGE_AT_EL3 -#endif - /* * Whether errata status needs reporting. Errata status is printed in debug * builds for both BL1 and BL31 images. |