summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Francis <[email protected]>2018-12-21 16:09:03 -0800
committerAnup Patel <[email protected]>2019-01-04 08:20:50 +0530
commitd6ddfdce3975c9484f8b7f9a364b3e75da780b2a (patch)
tree69ea4f8e8389cbf1490a4abe283d6df0fccc6cca
parent116f10973b539f056be55a24d2855a7a8b985c27 (diff)
Makefile: Use generic flags for the firmware
Signed-off-by: Alistair Francis <[email protected]>
-rw-r--r--Makefile1
-rw-r--r--firmware/objects.mk15
2 files changed, 9 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 9c6ea8d3..cdcb3c46 100644
--- a/Makefile
+++ b/Makefile
@@ -97,6 +97,7 @@ GENFLAGS += -I$(platform_dir)/include
GENFLAGS += -I$(platform_common_dir)/include
GENFLAGS += -I$(include_dir)
GENFLAGS += $(platform-genflags-y)
+GENFLAGS += $(firmware-genflags-y)
# Setup compilation environment
cpp=$(CROSS_COMPILE)cpp
diff --git a/firmware/objects.mk b/firmware/objects.mk
index a8275f9f..18a1fbc9 100644
--- a/firmware/objects.mk
+++ b/firmware/objects.mk
@@ -7,21 +7,22 @@
# SPDX-License-Identifier: BSD-2-Clause
#
+firmware-genflags-y =
firmware-cppflags-y +=
firmware-cflags-y +=
firmware-asflags-y +=
firmware-ldflags-y +=
ifdef FW_TEXT_START
-firmware-cppflags-y += -DFW_TEXT_START=$(FW_TEXT_START)
+firmware-genflags-y += -DFW_TEXT_START=$(FW_TEXT_START)
endif
firmware-bins-$(FW_JUMP) += fw_jump.bin
ifdef FW_JUMP_ADDR
-firmware-cppflags-$(FW_JUMP) += -DFW_JUMP_ADDR=$(FW_JUMP_ADDR)
+firmware-genflags-$(FW_JUMP) += -DFW_JUMP_ADDR=$(FW_JUMP_ADDR)
endif
ifdef FW_JUMP_FDT_ADDR
-firmware-cppflags-$(FW_JUMP) += -DFW_JUMP_FDT_ADDR=$(FW_JUMP_FDT_ADDR)
+firmware-genflags-$(FW_JUMP) += -DFW_JUMP_FDT_ADDR=$(FW_JUMP_FDT_ADDR)
endif
firmware-bins-$(FW_PAYLOAD) += fw_payload.bin
@@ -30,13 +31,13 @@ FW_PAYLOAD_PATH_FINAL=$(FW_PAYLOAD_PATH)
else
FW_PAYLOAD_PATH_FINAL=$(build_dir)/$(platform_subdir)/firmware/payloads/dummy.bin
endif
-firmware-cppflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_PATH=$(FW_PAYLOAD_PATH_FINAL)
+firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_PATH=$(FW_PAYLOAD_PATH_FINAL)
ifdef FW_PAYLOAD_OFFSET
-firmware-cppflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_OFFSET=$(FW_PAYLOAD_OFFSET)
+firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_OFFSET=$(FW_PAYLOAD_OFFSET)
endif
ifdef FW_PAYLOAD_FDT_PATH
-firmware-cppflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_FDT_PATH=$(FW_PAYLOAD_FDT_PATH)
+firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_FDT_PATH=$(FW_PAYLOAD_FDT_PATH)
endif
ifdef FW_PAYLOAD_FDT_ADDR
-firmware-cppflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_FDT_ADDR=$(FW_PAYLOAD_FDT_ADDR)
+firmware-genflags-$(FW_PAYLOAD) += -DFW_PAYLOAD_FDT_ADDR=$(FW_PAYLOAD_FDT_ADDR)
endif