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 /Makefile | |
parent | 61903ad7779994a5b04104006c86c5f3db2576c2 (diff) | |
download | trusted-firmware-a-9cefb4b194fe682fd45ece845e55a1f63e5d8a56.tar.gz |
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 'Makefile')
-rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -537,15 +537,15 @@ endif endif ifeq (${ARCH},aarch64) -BL1_CFLAGS += -DIMAGE_AT_EL3 +BL1_CPPFLAGS += -DIMAGE_AT_EL3 ifeq ($(BL2_AT_EL3),1) -BL2_CFLAGS += -DIMAGE_AT_EL3 +BL2_CPPFLAGS += -DIMAGE_AT_EL3 else -BL2_CFLAGS += -DIMAGE_AT_EL1 +BL2_CPPFLAGS += -DIMAGE_AT_EL1 endif -BL2U_CFLAGS += -DIMAGE_AT_EL1 -BL31_CFLAGS += -DIMAGE_AT_EL3 -BL32_CFLAGS += -DIMAGE_AT_EL1 +BL2U_CPPFLAGS += -DIMAGE_AT_EL1 +BL31_CPPFLAGS += -DIMAGE_AT_EL3 +BL32_CPPFLAGS += -DIMAGE_AT_EL1 endif # Include the CPU specific operations makefile, which provides default |