Unverified Commit bdd33afc authored by Dimitris Papastamos's avatar Dimitris Papastamos Committed by GitHub
Browse files

Merge pull request #1421 from Yann-lms/cpp_dtc

Build: add cpp build processing for dtb
parents a125014b 01d237cb
Showing with 6 additions and 2 deletions
+6 -2
...@@ -198,7 +198,8 @@ BL_COMMON_SOURCES += common/bl_common.c \ ...@@ -198,7 +198,8 @@ BL_COMMON_SOURCES += common/bl_common.c \
${COMPILER_RT_SRCS} \ ${COMPILER_RT_SRCS} \
${STDLIB_SRCS} ${STDLIB_SRCS}
INCLUDES += -Iinclude/bl1 \ INCLUDES += -Iinclude \
-Iinclude/bl1 \
-Iinclude/bl2 \ -Iinclude/bl2 \
-Iinclude/bl2u \ -Iinclude/bl2u \
-Iinclude/bl31 \ -Iinclude/bl31 \
......
...@@ -372,11 +372,14 @@ endef ...@@ -372,11 +372,14 @@ endef
define MAKE_DTB define MAKE_DTB
$(eval DOBJ := $(addprefix $(1)/,$(call SOURCES_TO_DTBS,$(2)))) $(eval DOBJ := $(addprefix $(1)/,$(call SOURCES_TO_DTBS,$(2))))
$(eval DPRE := $(addprefix $(1)/,$(patsubst %.dts,%.pre.dts,$(notdir $(2)))))
$(eval DEP := $(patsubst %.dtb,%.d,$(DOBJ))) $(eval DEP := $(patsubst %.dtb,%.d,$(DOBJ)))
$(DOBJ): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | fdt_dirs $(DOBJ): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | fdt_dirs
@echo " CPP $$<"
$$(Q)$$(CPP) $$(CPPFLAGS) -x assembler-with-cpp -o $(DPRE) $$<
@echo " DTC $$<" @echo " DTC $$<"
$$(Q)$$(DTC) $$(DTC_FLAGS) -d $(DEP) -o $$@ $$< $$(Q)$$(DTC) $$(DTC_FLAGS) -i fdts -d $(DEP) -o $$@ $(DPRE)
-include $(DEP) -include $(DEP)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment