diff options
author | Soby Mathew <soby.mathew@arm.com> | 2017-12-14 17:44:56 +0000 |
---|---|---|
committer | Soby Mathew <soby.mathew@arm.com> | 2018-02-26 16:31:10 +0000 |
commit | 38c14d88df23df82bf65d588dbb884f47640c519 (patch) | |
tree | 0a2b2e5e8e30c99c946b0b9e8e72c6bbbff8fb7c /make_helpers | |
parent | 566034fc27fc270b240efbef7a7dd9b0caf13c82 (diff) |
Makefile: Add `all` target to MAKE_DTBS
This patch makes some minor changes to `MAKE_DTBS` make macro
and adds `dtbs` target to the `all` make target.
Change-Id: I1c5b4a603ada31d2dac2ed73da9ff707b410dd11
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
Diffstat (limited to 'make_helpers')
-rw-r--r-- | make_helpers/build_macros.mk | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk index 9119dcd2..eba9168c 100644 --- a/make_helpers/build_macros.mk +++ b/make_helpers/build_macros.mk @@ -344,15 +344,18 @@ $(if $(2),$(call TOOL_ADD_IMG_PAYLOAD,bl$(1),$(BIN),--$(2),$(BIN),$(3))) endef +# Convert device tree source file names to matching blobs +# $(1) = input dts define SOURCES_TO_DTBS $(notdir $(patsubst %.dts,%.dtb,$(filter %.dts,$(1)))) endef -# MAKE_FDT macro defines the targets and options to build each FDT binary -# Arguments: (none) -define MAKE_FDT - $(eval DTB_BUILD_DIR := ${BUILD_PLAT}/fdts) - $(eval DTBS := $(addprefix $(DTB_BUILD_DIR)/,$(call SOURCES_TO_DTBS,$(FDT_SOURCES)))) +# MAKE_FDT_DIRS macro creates the prerequisite directories that host the +# FDT binaries +# $(1) = output directory +# $(2) = input dts +define MAKE_FDT_DIRS + $(eval DTBS := $(addprefix $(1)/,$(call SOURCES_TO_DTBS,$(2)))) $(eval TEMP_DTB_DIRS := $(sort $(dir ${DTBS}))) # The $(dir ) function leaves a trailing / on the directory names # Rip off the / to match directory names with make rule targets. @@ -361,19 +364,18 @@ define MAKE_FDT $(eval $(foreach objd,${DTB_DIRS},$(call MAKE_PREREQ_DIR,${objd},${BUILD_DIR}))) fdt_dirs: ${DTB_DIRS} - endef -# MAKE_DTB generate the Flattened device tree binary (device tree binary) +# MAKE_DTB generate the Flattened device tree binary # $(1) = output directory # $(2) = input dts define MAKE_DTB -$(eval DOBJ := $(1)/$(patsubst %.dts,%.dtb,$(notdir $(2)))) +$(eval DOBJ := $(addprefix $(1)/,$(call SOURCES_TO_DTBS,$(2)))) $(eval DEP := $(patsubst %.dtb,%.d,$(DOBJ))) $(DOBJ): $(2) $(MAKEFILE_LIST) | fdt_dirs - @echo " DTC $$<" + @echo " DTC $$<" $$(Q)$$(DTC) $$(DTC_FLAGS) -d $(DEP) -o $$@ $$< -include $(DEP) @@ -386,7 +388,11 @@ endef define MAKE_DTBS $(eval DOBJS := $(filter %.dts,$(2))) $(eval REMAIN := $(filter-out %.dts,$(2))) + $(and $(REMAIN),$(error FDT_SOURCES contain non-DTS files: $(REMAIN))) $(eval $(foreach obj,$(DOBJS),$(call MAKE_DTB,$(1),$(obj)))) - $(and $(REMAIN),$(error Unexpected s present: $(REMAIN))) + $(eval $(call MAKE_FDT_DIRS,$(1),$(2))) + +dtbs: $(DTBS) +all: dtbs endef |