From patchwork Tue Apr 21 03:35:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11500395 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 8502C14B4 for ; Tue, 21 Apr 2020 03:36:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6B25B2071E for ; Tue, 21 Apr 2020 03:36:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587440163; bh=tcMJgOdJYTK2DCQx6Q/Q8rhF+NrgCct1feulE1dILv8=; h=From:To:Cc:Subject:Date:List-ID:From; b=zc7w4D1DO3PwF2/uFPOU2un7B63GGfUuHnED6jeNHrM0eYgr8oHQ00ED7WkEmpQB2 C8KeKPvZPgYebApNumPH6u1JoFshUZCNUd1ezxlJYmTqNkEbNbUKCaRgUSlbBM8+15 6qukoDr3fCmi067kcsGdjgAWaTEeFE30z09YYZDM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727873AbgDUDgA (ORCPT ); Mon, 20 Apr 2020 23:36:00 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:52350 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727848AbgDUDf7 (ORCPT ); Mon, 20 Apr 2020 23:35:59 -0400 Received: from oscar.flets-west.jp (softbank126090202047.bbtec.net [126.90.202.47]) (authenticated) by conuserg-11.nifty.com with ESMTP id 03L3ZdWg001233; Tue, 21 Apr 2020 12:35:39 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com 03L3ZdWg001233 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1587440139; bh=XyRdHJjb8MoEiKRt48oj/OQ5B9m4bbw7cOjjdMtRtVE=; h=From:To:Cc:Subject:Date:From; b=0cU3jv+kmbuvcgsDRBo2orNdJvrvp2Ajo1ZOvtehWhvQi8VQAV2y0AwEeadX/hJb+ 6syaGBXmENROHsee++Uqq0K0qyIzWIM8bT82+IlHjU3yBP4vloV+GxU5lm+Mo+WgHb YI8eMyROpTuxiEev7pDRxguphe4y3cdl2DON/7aYsl+Nx4vQxcUwuACm16cVNGyU7l Bq19pA/dtZ4waL+mYElWnS94UcyEWZ8M/FFm6kt0JCW8YCfM/DcfeGy/bYpwd4Ci9H szEnBo8oKPEdRu65BM3x1p2x9KE50JHfpcCO0tStiLcFaQxA+OVYqsC3P5+ql0lx6v 33Iz/QjZsWTYg== X-Nifty-SrcIP: [126.90.202.47] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , Michal Marek , Rob Herring Subject: [PATCH 1/2] kbuild: fix DT binding schema rule again to avoid needless rebuilds Date: Tue, 21 Apr 2020 12:35:28 +0900 Message-Id: <20200421033529.487366-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Since commit 7a0496056064 ("kbuild: fix DT binding schema rule to detect command line changes"), this rule is every time re-run even if you change nothing. cmd_dtc takes one additional parameter to pass to the -O option of dtc. We need to pass 'yaml' to if_changed_rule. Otherwise, cmd-check invoked from if_changed_rule is false positive. Fixes: 7a0496056064 ("kbuild: fix DT binding schema rule to detect command line changes") 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 97547108ee7f..4b799737722c 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -309,7 +309,7 @@ define rule_dtc endef $(obj)/%.dt.yaml: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE - $(call if_changed_rule,dtc) + $(call if_changed_rule,dtc,yaml) dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) From patchwork Tue Apr 21 03:35:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11500397 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 693C41575 for ; Tue, 21 Apr 2020 03:36:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 515FE2071E for ; Tue, 21 Apr 2020 03:36:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587440171; bh=I/pbQmzGjJKqtybLWCiUXpb5mfjHNcIGDc2Iyys5SuM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=PCv8y7qDy8DP88YUU0KkmiGzuxO9ND/dGgKhwdrGT+5uVKt/8P43unNjRWe15du6A 8noahdR8v+4nFavnI9yU40SeKdirOSdPPonztIUVWySXKmUZ7i0kpQs90tCObAgduV 5PoZ+lOVR+yDpHtDcaGcK2o91gjChgEo6b4R1a64= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727931AbgDUDgL (ORCPT ); Mon, 20 Apr 2020 23:36:11 -0400 Received: from conuserg-11.nifty.com ([210.131.2.78]:52663 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726958AbgDUDgK (ORCPT ); Mon, 20 Apr 2020 23:36:10 -0400 Received: from oscar.flets-west.jp (softbank126090202047.bbtec.net [126.90.202.47]) (authenticated) by conuserg-11.nifty.com with ESMTP id 03L3ZdWh001233; Tue, 21 Apr 2020 12:35:40 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com 03L3ZdWh001233 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1587440140; bh=z+5DGjEAprgDxyLd7rZ+BckTVvQnx3Zz8y8zRWdf4rw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OwogK5ffXLUH4vGa7xHMEUhggPpcLZTYFpIyxwOCXNREHEGSGyTY0pTRl2yNd3Roh UQheeM+jfFg/f86aWzh0i9KfHWi97rNER07Jhxlc8tV3fm/kU+WUa6qCS1nfPIff1Z yFKlqZYRO+Z2GXul42VPXZJngOj2YEnDgeKP+Pp89+yz9CD/XnXAIpS5LDO+mLKZ8Y dYFExSxPy2Y/TS/M1ck9icbUD7xUYWdHf8/lfGUUcVKGwULjWPsbpBpZZRIYpoVOGs n+ruh3U4bIso6Kxg0PDI/MMzfnjBpaCbhywBRsC0c2vWgI0kxVOel3f3PrpTPTrw0L 9fqjPTX5rBUrg== X-Nifty-SrcIP: [126.90.202.47] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Rob Herring , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , Michal Marek Subject: [PATCH 2/2] kbuild: use separate commands for generating *.dtb and *.dt.yaml Date: Tue, 21 Apr 2020 12:35:29 +0900 Message-Id: <20200421033529.487366-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200421033529.487366-1-masahiroy@kernel.org> References: <20200421033529.487366-1-masahiroy@kernel.org> MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Currently, cmd_dtc takes $(2) to select the target format. The additional parameter complicates things when it is used with cmd_and_fixdep and if_changed_rule. To make it easier to understand, use a separate cmd_dtc_yaml. One visible change is, 'DTC [Y]' is used for the log when compiling *.dts to *.dt.yaml. Signed-off-by: Masahiro Yamada --- scripts/Makefile.lib | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 4b799737722c..d5ac19e10e1d 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -284,32 +284,37 @@ cmd_dt_S_dtb= \ $(obj)/%.dtb.S: $(obj)/%.dtb FORCE $(call if_changed,dt_S_dtb) -quiet_cmd_dtc = DTC $@ -cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ +__cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ - $(DTC) -O $(2) -o $@ -b 0 \ + $(DTC) -O $(1) -o $@ -b 0 \ $(addprefix -i,$(dir $<) $(DTC_INCLUDE)) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile) +quiet_cmd_dtc = DTC $@ + cmd_dtc = $(call __cmd_dtc,dtb) + $(obj)/%.dtb: $(src)/%.dts $(DTC) FORCE - $(call if_changed_dep,dtc,dtb) + $(call if_changed_dep,dtc) DT_CHECKER ?= dt-validate DT_BINDING_DIR := Documentation/devicetree/bindings # DT_TMP_SCHEMA may be overridden from Documentation/devicetree/bindings/Makefile DT_TMP_SCHEMA ?= $(objtree)/$(DT_BINDING_DIR)/processed-schema.yaml +quiet_cmd_dtc_yaml = DTC [Y] $@ + cmd_dtc_yaml = $(call __cmd_dtc,yaml) + quiet_cmd_dtb_check = CHECK $@ cmd_dtb_check = $(DT_CHECKER) -u $(srctree)/$(DT_BINDING_DIR) -p $(DT_TMP_SCHEMA) $@ -define rule_dtc - $(call cmd_and_fixdep,dtc,yaml) +define rule_dtc_yaml + $(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,yaml) + $(call if_changed_rule,dtc_yaml) dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp)