On Wed, Jul 27, 2022 at 4:06 AM Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> wrote: > > It is useful to be able to recheck dtbs files against a limited set of > DT schema files. This can be accomplished by using differnt > DT_SCHEMA_FILES argument values while rerunning make dtbs_check. However > for some reason if_changed_rule doesn't pick up the rule_dtc changes > (and doesn't retrigger the build). > > Fix this by changing if_changed_rule to if_changed_dep and squashing DTC > and dt-validate into a single new command. Then if_changed_dep triggers > on DT_SCHEMA_FILES changes and reruns the build/check. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx> > --- > scripts/Makefile.lib | 14 ++++++-------- > 1 file changed, 6 insertions(+), 8 deletions(-) > > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > index c88b98b5dc44..3df470289382 100644 > --- a/scripts/Makefile.lib > +++ b/scripts/Makefile.lib > @@ -383,17 +383,15 @@ DT_CHECKER_FLAGS ?= $(if $(DT_SCHEMA_FILES),-l $(DT_SCHEMA_FILES),-m) > DT_BINDING_DIR := Documentation/devicetree/bindings > DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.json > > -quiet_cmd_dtb_check = CHECK $@ > - cmd_dtb_check = $(DT_CHECKER) $(DT_CHECKER_FLAGS) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ || true > +quiet_cmd_dtb = DTC/CHECK $@ This is supposed to be 7 chars or less. DTCCHK or DTC_CHK perhaps. Or always do just 'DTC'. I can fixup when applying. I'll give it a few days for other comments. > + cmd_dtb = $(cmd_dtc) ; $(DT_CHECKER) $(DT_CHECKER_FLAGS) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ || true > +else > +quiet_cmd_dtb = $(quiet_cmd_dtc) > + cmd_dtb = $(cmd_dtc) > endif > > -define rule_dtc > - $(call cmd_and_fixdep,dtc) > - $(call cmd,dtb_check) > -endef > - > $(obj)/%.dtb: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE > - $(call if_changed_rule,dtc) > + $(call if_changed_dep,dtb) > > $(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE > $(call if_changed_dep,dtc) > -- > 2.35.1 >
