History

Merge branch 'linus' into locking/kcsan, to pick up fixes

Ingo Molnar committed 6 years ago

Commit df108462 parents a4654e9 5ad0ec0906 files · +8764 −4406Browse files

Showing the changes to scripts/Makefile.lib (1 of 906 files). Show all

Unified · Split

scripts/Makefile.lib+3−3
@@ -310,15 +310,15 @@ DT_BINDING_DIR := Documentation/devicetree/bindings · 309 unmodified lines
310DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.yaml310DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.yaml
311 311
312quiet_cmd_dtb_check = CHECK $@312quiet_cmd_dtb_check = CHECK $@
313 cmd_dtb_check = $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ ;313 cmd_dtb_check = $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@
314 314
315define rule_dtc_dt_yaml315define rule_dtc
316 $(call cmd_and_fixdep,dtc,yaml)316 $(call cmd_and_fixdep,dtc,yaml)
317 $(call cmd,dtb_check)317 $(call cmd,dtb_check)
318endef318endef
319 319
320$(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE320$(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE
321 $(call if_changed_rule,dtc_dt_yaml)321 $(call if_changed_rule,dtc)
322 322
323dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)323dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)
324 324