| Message ID | 20240430202928.1143802-3-robh@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | dt-bindings: kbuild: Fix dt_binding_check for arch without dts directory | expand |
On Wed, May 1, 2024 at 5:30 AM Rob Herring (Arm) <robh@kernel.org> wrote: > > Commit 1d06c77d93da ("dt-bindings: kbuild: Add separate > target/dependency for processed-schema.json") placed setting CHECK_DTBS > for 'dt_binding_check' target within the section that depends on having > arch/$ARCH/boot/dts/ which x86 doesn't have for example. That results in > the schema checks not running for the examples. Move setting it back out > of the conditional section as it was (CHECK_DT_BINDING is still > replaced). > > Fixes: 1d06c77d93da ("dt-bindings: kbuild: Add separate target/dependency for processed-schema.json") > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> > --- > Cc: devicetree@vger.kernel.org > > Masahiro, Please take this as the above commit is in your tree. I squashed this to the original commit. Thanks. > > Makefile | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index f4fe5b0ea931..43a2a630436a 100644 > --- a/Makefile > +++ b/Makefile > @@ -1403,7 +1403,7 @@ dtbs: dtbs_prepare > # dtbs_install depend on it as dtbs_install may run as root. > dtbs_prepare: include/config/kernel.release scripts_dtc > > -ifneq ($(filter dt_binding_check dtbs_check, $(MAKECMDGOALS)),) > +ifneq ($(filter dtbs_check, $(MAKECMDGOALS)),) > export CHECK_DTBS=y > endif > > @@ -1422,6 +1422,10 @@ endif > > endif > > +ifneq ($(filter dt_binding_check, $(MAKECMDGOALS)),) > +export CHECK_DTBS=y > +endif > + > PHONY += scripts_dtc > scripts_dtc: scripts_basic > $(Q)$(MAKE) $(build)=scripts/dtc > -- > 2.43.0 >
diff --git a/Makefile b/Makefile index f4fe5b0ea931..43a2a630436a 100644 --- a/Makefile +++ b/Makefile @@ -1403,7 +1403,7 @@ dtbs: dtbs_prepare # dtbs_install depend on it as dtbs_install may run as root. dtbs_prepare: include/config/kernel.release scripts_dtc -ifneq ($(filter dt_binding_check dtbs_check, $(MAKECMDGOALS)),) +ifneq ($(filter dtbs_check, $(MAKECMDGOALS)),) export CHECK_DTBS=y endif @@ -1422,6 +1422,10 @@ endif endif +ifneq ($(filter dt_binding_check, $(MAKECMDGOALS)),) +export CHECK_DTBS=y +endif + PHONY += scripts_dtc scripts_dtc: scripts_basic $(Q)$(MAKE) $(build)=scripts/dtc
Commit 1d06c77d93da ("dt-bindings: kbuild: Add separate target/dependency for processed-schema.json") placed setting CHECK_DTBS for 'dt_binding_check' target within the section that depends on having arch/$ARCH/boot/dts/ which x86 doesn't have for example. That results in the schema checks not running for the examples. Move setting it back out of the conditional section as it was (CHECK_DT_BINDING is still replaced). Fixes: 1d06c77d93da ("dt-bindings: kbuild: Add separate target/dependency for processed-schema.json") Signed-off-by: Rob Herring (Arm) <robh@kernel.org> --- Cc: devicetree@vger.kernel.org Masahiro, Please take this as the above commit is in your tree. Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)