Currently, cmd_dtc takes $(2) to select the target format. The
additional parameter complicates things when it is used with
cmd_and_fixdep and if_changed_rule.
To make it easier to understand, use a separate cmd_dtc_yaml.
One visible change is, 'DTCYAML' is used for the log when compiling
*.dts to *.dt.yaml.
Signed-off-by: Masahiro Yamada <masahi...@kernel.org>
---
scripts/Makefile.lib | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 4b799737722c..8f9f2abf3d67 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -284,32 +284,37 @@ cmd_dt_S_dtb=
\
$(obj)/%.dtb.S: $(obj)/%.dtb FORCE
$(call if_changed,dt_S_dtb)
-quiet_cmd_dtc = DTC $@
-cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
+__cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
$(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \
- $(DTC) -O $(2) -o $@ -b 0 \
+ $(DTC) -O $(1) -o $@ -b 0 \
$(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \
-d $(depfile).dtc.tmp $(dtc-tmp) ; \
cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
+quiet_cmd_dtc = DTC $@
+ cmd_dtc = $(call __cmd_dtc,dtb)
+
$(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE
- $(call if_changed_dep,dtc,dtb)
+ $(call if_changed_dep,dtc)
DT_CHECKER ?= dt-validate
DT_BINDING_DIR := Documentation/devicetree/bindings
# DT_TMP_SCHEMA may be overridden from
Documentation/devicetree/bindings/Makefile
DT_TMP_SCHEMA ?= $(objtree)/$(DT_BINDING_DIR)/processed-schema.yaml
+quiet_cmd_dtc_yaml = DTCYAML $@
+ cmd_dtc_yaml = $(call __cmd_dtc,yaml)
+
quiet_cmd_dtb_check = CHECK $@
cmd_dtb_check = $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p
$(DT_TMP_SCHEMA) $@
-define rule_dtc
- $(call cmd_and_fixdep,dtc,yaml)
+define rule_dtc_yaml
+ $(call cmd_and_fixdep,dtc_yaml)
$(call cmd,dtb_check)
endef
$(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
- $(call if_changed_rule,dtc,yaml)
+ $(call if_changed_rule,dtc_yaml)
dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
--
2.25.1
