Re: [PATCH 5/5] kbuild: allow to run dt_binding_check and dtbs_check in a single command

[Masahiro Yamada]

On Sun, Feb 23, 2020 at 4:04 AM Masahiro Yamada <masahiroy@xxxxxxxxxx> wrote:
>
> Since commit 93512dad334d ("dt-bindings: Improve validation build error
> handling"), 'make dtbs_check' does not validate the schema fully.
>
> If you want to check everything, you need to run two commands.
>
>   $ make ARCH=arm dt_binding_check
>   $ make ARCH=arm dtbs_check
>
> You cannot do:
>
>   $ make ARCH=arm dt_binding_check dtbs_check
>
> Because CHECK_DTBS is set, dt-doc-validate and dt-extract-example
> are skipped.
>
> Making it work will be useful for schema writers.
>
> Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
> ---



Sorry, I take back this patch.

'make dtbs_check dt_binding_chec' does not work.



>
>  Documentation/devicetree/bindings/Makefile  | 6 ++----
>  Documentation/devicetree/writing-schema.rst | 4 ++++
>  Makefile                                    | 8 +++++---
>  3 files changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/Makefile b/Documentation/devicetree/bindings/Makefile
> index 646cb3525373..6efa2094b95e 100644
> --- a/Documentation/devicetree/bindings/Makefile
> +++ b/Documentation/devicetree/bindings/Makefile
> @@ -25,10 +25,8 @@ DT_DOCS = $(shell \
>
>  DT_SCHEMA_FILES ?= $(addprefix $(src)/,$(DT_DOCS))
>
> -ifeq ($(CHECK_DTBS),)
> -extra-y += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))
> -extra-y += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES))
> -endif
> +extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dts, $(DT_SCHEMA_FILES))
> +extra-$(CHECK_DT_BINDING) += $(patsubst $(src)/%.yaml,%.example.dt.yaml, $(DT_SCHEMA_FILES))
>
>  $(obj)/$(DT_TMP_SCHEMA): $(DT_SCHEMA_FILES) FORCE
>         $(call if_changed,mk_schema)
> diff --git a/Documentation/devicetree/writing-schema.rst b/Documentation/devicetree/writing-schema.rst
> index 7635ab230456..220cf464ed77 100644
> --- a/Documentation/devicetree/writing-schema.rst
> +++ b/Documentation/devicetree/writing-schema.rst
> @@ -147,6 +147,10 @@ Note that ``dtbs_check`` will skip any binding schema files with errors. It is
>  necessary to use ``dt_binding_check`` to get all the validation errors in the
>  binding schema files.
>
> +It is possible to run both in a single command::
> +
> +    make dt_binding_check dtbs_check
> +
>  It is also possible to run checks with a single schema file by setting the
>  ``DT_SCHEMA_FILES`` variable to a specific schema file.
>
> diff --git a/Makefile b/Makefile
> index 83f9b8f6fbaf..59dd768a1c1e 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1243,7 +1243,7 @@ dtbs dtbs_check: include/config/kernel.release scripts_dtc
>         $(Q)$(MAKE) $(build)=$(dtstree)
>
>  dtbs_check: export CHECK_DTBS=1
> -dtbs_check: dt_binding_check
> +dtbs_check: __dt_binding_check
>
>  dtbs_install:
>         $(Q)$(MAKE) $(dtbinst)=$(dtstree)
> @@ -1258,8 +1258,10 @@ PHONY += scripts_dtc
>  scripts_dtc: scripts_basic
>         $(Q)$(MAKE) $(build)=scripts/dtc
>
> -PHONY += dt_binding_check
> -dt_binding_check: scripts_dtc
> +PHONY += dt_binding_check __dt_binding_check
> +dt_binding_check: export CHECK_DT_BINDING=y
> +dt_binding_check: __dt_binding_check
> +__dt_binding_check: scripts_dtc
>         $(Q)$(MAKE) $(build)=Documentation/devicetree/bindings
>
>  # ---------------------------------------------------------------------------
> --
> 2.17.1
>


-- 
Best Regards
Masahiro Yamada