aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--make_helpers/build_macros.mk5
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 17630fbf38..f230f4af3a 100644
--- a/Makefile
+++ b/Makefile
@@ -198,7 +198,8 @@ BL_COMMON_SOURCES += common/bl_common.c \
${COMPILER_RT_SRCS} \
${STDLIB_SRCS}
-INCLUDES += -Iinclude/bl1 \
+INCLUDES += -Iinclude \
+ -Iinclude/bl1 \
-Iinclude/bl2 \
-Iinclude/bl2u \
-Iinclude/bl31 \
diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk
index cac9dfc44b..2a6ded4970 100644
--- a/make_helpers/build_macros.mk
+++ b/make_helpers/build_macros.mk
@@ -372,11 +372,14 @@ endef
define MAKE_DTB
$(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)))
$(DOBJ): $(2) $(filter-out %.d,$(MAKEFILE_LIST)) | fdt_dirs
+ @echo " CPP $$<"
+ $$(Q)$$(CPP) $$(CPPFLAGS) -x assembler-with-cpp -o $(DPRE) $$<
@echo " DTC $$<"
- $$(Q)$$(DTC) $$(DTC_FLAGS) -d $(DEP) -o $$@ $$<
+ $$(Q)$$(DTC) $$(DTC_FLAGS) -i fdts -d $(DEP) -o $$@ $(DPRE)
-include $(DEP)