From patchwork Sat Feb 22 19:04:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11398299 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4787414BC for ; Sat, 22 Feb 2020 19:05:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 26CDB20707 for ; Sat, 22 Feb 2020 19:05:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582398311; bh=GGfJRcDzhaMcrw2ayyBjy+cETpDI32AHpC28rYLDq+U=; h=From:To:Cc:Subject:Date:List-ID:From; b=e1z52uG7/0NohIYtONhaYOhxIqwa2sVWu0aWjDQkOfvZrWBQf3Xdw/P7gDBpPU0yl Cmd/u6erubwkcmVEPC++gNU3agn8/fYskgjwCgP2JQbOoB1WjYdXgkOusGOrfEe2T9 LQbt+aNXL3eIblHKsp+UEegDATcgG6lHRue0PmPI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726701AbgBVTFG (ORCPT ); Sat, 22 Feb 2020 14:05:06 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:23007 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726817AbgBVTEz (ORCPT ); Sat, 22 Feb 2020 14:04:55 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-09.nifty.com with ESMTP id 01MJ4cZ3012807; Sun, 23 Feb 2020 04:04:38 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 01MJ4cZ3012807 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1582398279; bh=OAJy6pWrxR7lNpcqlMigyzZQUmooD1dwjoIE2utcEN8=; h=From:To:Cc:Subject:Date:From; b=fs8OZ1BpLTf9CvWG/+boO5Xwn0uv7awOShJbmu6/QPDxlfFug5xTxVenYrtEs15im Z/iIfq+RtfKavg5Ng97XjyMDv3APCdbaTgcBKPJW3EF9pf2ZVAlBNdeOZ3brvI724a q74/+opbx6TRgHCbtO5go/1E0JDtH56ZEPk/EcH4iQ7Lw/wtEy2RvX3Xj0x5dhH8zv DZamwd2FHJhk6Ylc9rRWCfnSOCN6OsZYxKoboUagaT9+nJ/QZgBvk/wJ7ScKr9hkq7 XWv/ttvnN2MQG/Kh7Uo1xFFOKA2yqevSF87IAjfTSkAUvOb/pUo76gHb+4QOsbAgg1 0uN4HhOlYyo3g== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Rob Herring , devicetree@vger.kernel.org, Masahiro Yamada , Michal Marek , Rob Herring , linux-kernel@vger.kernel.org Subject: [PATCH 1/5] kbuild: fix DT binding schema rule to detect command line changes Date: Sun, 23 Feb 2020 04:04:31 +0900 Message-Id: <20200222190435.11767-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org This if_change_rule is not working; it cannot detect any command line changes. 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 Acked-by: Rob Herring --- scripts/Makefile.lib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index bae62549e3d2..64b938c10039 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -302,13 +302,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) From patchwork Sat Feb 22 19:04:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11398297 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2DFC014BC for ; Sat, 22 Feb 2020 19:05:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 039CB206EF for ; Sat, 22 Feb 2020 19:05:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582398307; bh=YiWf/FYt2l+Or/lobMbtOdv8wa//de5wWbhZINemizQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WpbfiYjwgMgVsR/kOXfyIi/qsqK9KqGcIICayuJVpnGcQORKNBkOtMmv/G2c9jAT3 /AVw84SPcekvnNUz8Pg+9/+IDB9PiaLMCJ1tOwSM/kA/fl3KuqHC8NpE4P6XrO5nxg Ck95+/+tRLkhgD73hptYLZMn/1CvCNOWGRCMuYbQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726924AbgBVTEz (ORCPT ); Sat, 22 Feb 2020 14:04:55 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:23006 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726767AbgBVTEz (ORCPT ); Sat, 22 Feb 2020 14:04:55 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-09.nifty.com with ESMTP id 01MJ4cZ4012807; Sun, 23 Feb 2020 04:04:39 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 01MJ4cZ4012807 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1582398280; bh=CKV2mLdhn4rZmWRUQWRtoBNfJibOoB2mxoSqdYrpxT8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bXwa5UjtDiDN0ZVWw7SA3NWvmQJDFc2CgBdllAU4YwuemCPVYL/aL/ROECuldUl73 Cx9wQP7dkqTkwP8pqoF1zSjvptolR/oGB+1sG5o4OVNn4zNhZi/6x9hl+jd5VxHXWA f/03VJL5JpRYdkgYo3SBEO+xKvcUeCGXAhJIU+Y+NW+J5Ay3/Bep+TZ4Nx5VViW958 5MOC0a4/ccTG/3pX9yuCgLthOgczd9KxOz1Y9ZqXNUs4+Rw4xk6fkuOQEDuK+2gLm2 K/SYxThoDioVsJu7UPHy17fwvQV/j4EoXPPruL6oJy9IgcZDY1pjc9yWh36OlRcN7o QlztR3TUqItog== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Rob Herring , devicetree@vger.kernel.org, Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 2/5] kbuild: remove unneeded semicolon at the end of cmd_dtb_check Date: Sun, 23 Feb 2020 04:04:32 +0900 Message-Id: <20200222190435.11767-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200222190435.11767-1-masahiroy@kernel.org> References: <20200222190435.11767-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org This trailing semicolon is unneeded. Signed-off-by: Masahiro Yamada --- scripts/Makefile.lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 64b938c10039..752ff0a225a9 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -300,7 +300,7 @@ DT_BINDING_DIR := Documentation/devicetree/bindings 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) $@ ; + cmd_dtb_check = $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ define rule_dtc $(call cmd_and_fixdep,dtc,yaml) From patchwork Sat Feb 22 19:04:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11398295 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B7C4492A for ; Sat, 22 Feb 2020 19:05:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8CF02206EF for ; Sat, 22 Feb 2020 19:05:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582398306; bh=fwbT9Mep0GZjK9Bl6lO7YTQUECfVKAMH7RJytq0zw0E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=X+e7tM72qhM6Gsv5P/KFz1pt0VmfqIc48wvNASzxndTa3MBq2UkUVa/lKbv9GtXYC rTA5fov1mD5mNoOOlGvfTvOgBADLQBHDsmmPJpanReGk4K5dEOyInLuiSDgKGSogD9 xBlZGyh8iWqC2GQ4F+3uifLVf8z6utIIMC5xFR4Q= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726943AbgBVTEz (ORCPT ); Sat, 22 Feb 2020 14:04:55 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:23005 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726791AbgBVTEz (ORCPT ); Sat, 22 Feb 2020 14:04:55 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-09.nifty.com with ESMTP id 01MJ4cZ5012807; Sun, 23 Feb 2020 04:04:40 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 01MJ4cZ5012807 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1582398280; bh=mrcXVofupgO4d3c0vzyQKQn7NS2LwHZgk1SmeQ1M0CA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ENwtBFQCC6YJf2mbU6dDo5FZWRPT+R9/FRc2vSXAGAatC3yS+xArurV1ylVHsN4vA rOmUEFRmeTAqouuS5JdUx8HrJYOrDbnDyISxwXdE/as1zryF99vUsXL5hXlZF6kFoG z+14SVvgCosITMo/tLqa/Tbc4qUHx48mzZlmTQrImSxPnNqWO2NT/l4BXMr64SPwUo ADlBEnutKk1OWjcTV29gSoeRIZpFLg9ZidVkcVFUx0jm0R0IsRP/L1n+G0XDMRBip5 Csk93cWEypB7PVs0ka4g3vkw6oe0VdNrfjRlTE4Ymu6Tb0NjxKEqxgsj2ZpAD1Wky5 CZU0WREsxBijg== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Rob Herring , devicetree@vger.kernel.org, Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 3/5] kbuild: add dtbs_check to PHONY Date: Sun, 23 Feb 2020 04:04:33 +0900 Message-Id: <20200222190435.11767-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200222190435.11767-1-masahiroy@kernel.org> References: <20200222190435.11767-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org The dtbs_check should be a phony target, but currently it is not specified so. 'make dtbs_check' works even if a file named 'dtbs_check' exists because it depends on another phony target, scripts_dtc, but we should not rely on it. Add dtbs_check to PHONY. Signed-off-by: Masahiro Yamada --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index aab38cb02b24..102710a9228c 100644 --- a/Makefile +++ b/Makefile @@ -1238,7 +1238,7 @@ ifneq ($(dtstree),) %.dtb: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ -PHONY += dtbs dtbs_install dt_binding_check +PHONY += dtbs dtbs_install dtbs_check dt_binding_check dtbs dtbs_check: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) From patchwork Sat Feb 22 19:04:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11398291 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2FC9F14BC for ; Sat, 22 Feb 2020 19:04:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 056E220707 for ; Sat, 22 Feb 2020 19:04:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582398295; bh=ZqbO1fcS9HWOteOgaRlUyNeb3iSn+PG2ujIzwG6SWWM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Off1vf9dzKFzKofUwP2Lk4x6ileX87e47Z5Kf6CleL2DG7ELWbp3OQpBtFhpz5b9G qpT8IX8tFYtbEPwa+fAkfHbujV+KzDm07ihkJbxKaS56uz/VCHXfEGkGEcCzdEYxkJ 6NEedcx80dOKPpWv4OvAdEnj6M0g2QQeLWl/e0mc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726824AbgBVTEy (ORCPT ); Sat, 22 Feb 2020 14:04:54 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:23008 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726758AbgBVTEy (ORCPT ); Sat, 22 Feb 2020 14:04:54 -0500 X-Greylist: delayed 11519 seconds by postgrey-1.27 at vger.kernel.org; Sat, 22 Feb 2020 14:04:53 EST Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-09.nifty.com with ESMTP id 01MJ4cZ6012807; Sun, 23 Feb 2020 04:04:40 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 01MJ4cZ6012807 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1582398281; bh=bmT77VUANmQdBakUB1snAYo2YaYV2b/WXJDLs84Hovk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yBsvDE/CYqb/HNefyT+1ZKG3smJf90UvTH//vprBPxgqpAcpFMjIGZNXdWHO3jFHO La5hBmQeGJ+LoM62Q6eqG1w+GUNOauaL4wPfmAVUxEjy7DsQFuhOUAKisNfq8UHBdi Ypbw+bad/q8L1ccq7X7v3ZguMUV30JQO+ptaKmyO5cREQeI5ZZGavMbkaUDRpXhwio fHGtozZ4+YBkhikIIuh+7dfUEhVdQB97Nrtzt5NJGYqJH1I1VrJB8XoX7PryiHFRIV 5m9kjWxSHHi7/CRjvHQP3kzNRe/H+1iwHL69/1VIOvv/OEndK/tX3XXVoU5QD90lx3 Ox7EpMRfKqfDw== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Rob Herring , devicetree@vger.kernel.org, Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 4/5] kbuild: add dt_binding_check to PHONY in a correct place Date: Sun, 23 Feb 2020 04:04:34 +0900 Message-Id: <20200222190435.11767-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200222190435.11767-1-masahiroy@kernel.org> References: <20200222190435.11767-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org The dt_binding_check is added to PHONY, but it is visible only when $(dtstree) is not empty. So, it is not specified as phony for ARCH=x86 etc. Add it to PHONY outside the ifneq ... endif block. Signed-off-by: Masahiro Yamada --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 102710a9228c..83f9b8f6fbaf 100644 --- a/Makefile +++ b/Makefile @@ -1238,7 +1238,7 @@ ifneq ($(dtstree),) %.dtb: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) $(dtstree)/$@ -PHONY += dtbs dtbs_install dtbs_check dt_binding_check +PHONY += dtbs dtbs_install dtbs_check dtbs dtbs_check: include/config/kernel.release scripts_dtc $(Q)$(MAKE) $(build)=$(dtstree) @@ -1258,6 +1258,7 @@ PHONY += scripts_dtc scripts_dtc: scripts_basic $(Q)$(MAKE) $(build)=scripts/dtc +PHONY += dt_binding_check dt_binding_check: scripts_dtc $(Q)$(MAKE) $(build)=Documentation/devicetree/bindings From patchwork Sat Feb 22 19:04:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11398293 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0206192A for ; Sat, 22 Feb 2020 19:05:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D572F20707 for ; Sat, 22 Feb 2020 19:05:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582398304; bh=bZGsq3QGq9Uia3PPbJusqM4Yd3Y7GVGLYqm4bOOErYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OTNoZK5RKHmEWobw+xMnsNtj1T4A5Yd9tpM9qJua3x1EZiomLJBYuVS6x1aM7Dzpl 2JvPUiXXd0xsJ3kZus6EKsDSpk5upTHnt4eIBlnb0qFTt7/xuvEtHqy3Ivy8HLw7BB sFn+OTDF8GueNzcNb+TpYKqGb4pK1YESBZk02IBQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726895AbgBVTFA (ORCPT ); Sat, 22 Feb 2020 14:05:00 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:23060 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727025AbgBVTE7 (ORCPT ); Sat, 22 Feb 2020 14:04:59 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-09.nifty.com with ESMTP id 01MJ4cZ7012807; Sun, 23 Feb 2020 04:04:41 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com 01MJ4cZ7012807 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1582398282; bh=+FVDFnLL298bgalkTSawbKe4OXpVDH31Bj+BPaPEFT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d1YL5vpg+R4/voPIKhG+mWqnSEUKdufZNN0UNuCAAm8dpbCqJSOy/yk+uniwbGZde Zy4blMojdzY32BqtqKd472LQgDCHCVMxUJrtcmiw4HB5zaDErCtBwe0cp4TF1Bv31Y TIKeYB95nt9lvjql7zAiJfFHq/Mam7jkWIEDZW8GfjN88zg6XXHjqKzVBucrFcaiFE r+UHfUZTNejNJyLEm0XQUarXL+XCimhiHljnzeFo8kXDT0b6T2Ffl0QN1NOgseidug /qdPCR4hOUviBa4AyuU/orL15EtJKshu7dqttMQy80bZG+5X9KzIOU16dp+QWKzoRk TGs6ABxjpYl2g== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Rob Herring , devicetree@vger.kernel.org, Masahiro Yamada , Mark Rutland , Maxime Ripard , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 5/5] kbuild: allow to run dt_binding_check and dtbs_check in a single command Date: Sun, 23 Feb 2020 04:04:35 +0900 Message-Id: <20200222190435.11767-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200222190435.11767-1-masahiroy@kernel.org> References: <20200222190435.11767-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org 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 --- 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 # ---------------------------------------------------------------------------