lkml.org 
[lkml]   [2020]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 43/67] kbuild: fix DT binding schema rule to detect command line changes
    Date
    From: Masahiro Yamada <masahiroy@kernel.org>

    [ Upstream commit 7a04960560640ac5b0b89461f7757322b57d0c7a ]

    This if_change_rule is not working properly; it cannot detect any
    command line change.

    The reason is because cmd-check in scripts/Kbuild.include compares
    $(cmd_$@) and $(cmd_$1), but cmd_dtc_dt_yaml does not exist here.

    For if_change_rule to work properly, the stem part of cmd_* and rule_*
    must match. Because this cmd_and_fixdep invokes cmd_dtc, this rule must
    be named rule_dtc.

    Fixes: 4f0e3a57d6eb ("kbuild: Add support for DT binding schema checks")
    Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
    Acked-by: Rob Herring <robh@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    scripts/Makefile.lib | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
    index 3fa32f83b2d74..a66fc0acad1e4 100644
    --- a/scripts/Makefile.lib
    +++ b/scripts/Makefile.lib
    @@ -291,13 +291,13 @@ DT_TMP_SCHEMA := $(objtree)/$(DT_BINDING_DIR)/processed-schema.yaml
    quiet_cmd_dtb_check = CHECK $@
    cmd_dtb_check = $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ ;

    -define rule_dtc_dt_yaml
    +define rule_dtc
    $(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_dt_yaml)
    + $(call if_changed_rule,dtc)

    dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)

    --
    2.20.1
    \
     
     \ /
      Last update: 2020-03-05 18:15    [W:2.218 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site