From patchwork Fri Mar 6 17:08:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11424357 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 0B627138D for ; Fri, 6 Mar 2020 17:09:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF9E820717 for ; Fri, 6 Mar 2020 17:09:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583514541; bh=iDBSFL/JrgLYjgShAoW3V/HC0dDpvZhItZ9MMJMwJUg=; h=From:To:Cc:Subject:Date:List-ID:From; b=fxeKMIdeos50YdhdzVsEtbyWBU06NWhpJv0tZcUib/5p+4OWoUdEETOltwNRourQ7 b7jPxKaTcRfWISbRF4Lc9qnOd7UnZDwJnzoor+WYwqh2JJOGzYCdycu/74ugeNRErc bb/RT/Ol/auEttxwmF7KvIJUseFkGVl4qSrdwB88= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726307AbgCFRJB (ORCPT ); Fri, 6 Mar 2020 12:09:01 -0500 Received: from conuserg-11.nifty.com ([210.131.2.78]:31048 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725873AbgCFRJB (ORCPT ); Fri, 6 Mar 2020 12:09:01 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-11.nifty.com with ESMTP id 026H8r3X022896; Sat, 7 Mar 2020 02:08:54 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com 026H8r3X022896 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1583514534; bh=dX7KkYXULgzx8g5CD/y+Pj6tm++eBD7NUDEAVoHN7Aw=; h=From:To:Cc:Subject:Date:From; b=ManCIrDUkyS6cD3+B1Zq2T7YG4g8wopZxMxjSn6bFDb1cmAkxMrUe2ixKPGdp6qet p8T6b4bHva1Eby0Z3dXlBzKYxr5WyUN56GwQ+8BEO5cuL6yDdOMrscThDnIUW7aIRr GJiq5AP2W7zZLs7B/gbG96jj1yqhhHSItfS3+BGJFUOw+7bNWsdTtcFf5baXPenmQ3 D8aIlTntvNZRB4vLurYBHKe5uadn7NX6WjXCJgW9BNMs0/9tRAtC6qly6K2vWLg+A4 MLaaccv1Tbf/v9z31av4phSQPROfvY10rQDMqv6iV38/mh17NuTa5GfxuZvvEWp1L4 V0xMo+uKK8ODQ== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Michal Marek Subject: [PATCH 1/2] kbuild: compute the dtbs_install destination more simply Date: Sat, 7 Mar 2020 02:08:51 +0900 Message-Id: <20200306170852.17798-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 The 'dtbinst_root' is used to remember the root of the in-kernel dts directory (e.g. arch/*/boot/dts), but it looks clumsy. I prefer using two variables 'obj' and 'dst' to track the in-kernel directory and the install destination, respectively. Signed-off-by: Masahiro Yamada --- Makefile | 2 +- scripts/Makefile.dtbinst | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index f68d05ee2900..be237edd2c7f 100644 --- a/Makefile +++ b/Makefile @@ -1253,7 +1253,7 @@ dtbs_check: export CHECK_DTBS=1 dtbs_check: dt_binding_check dtbs_install: - $(Q)$(MAKE) $(dtbinst)=$(dtstree) + $(Q)$(MAKE) $(dtbinst)=$(dtstree) dst=$(INSTALL_DTBS_PATH) ifdef CONFIG_OF_EARLY_FLATTREE all: dtbs diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst index 7301ab5e2e06..fcd5f2eaaad1 100644 --- a/scripts/Makefile.dtbinst +++ b/scripts/Makefile.dtbinst @@ -13,8 +13,6 @@ src := $(obj) PHONY := __dtbs_install __dtbs_install: -export dtbinst_root ?= $(obj) - include include/config/auto.conf include scripts/Kbuild.include include $(src)/Makefile @@ -26,13 +24,11 @@ dtbinst-dirs := $(subdir-y) $(subdir-m) quiet_cmd_dtb_install = INSTALL $< cmd_dtb_install = mkdir -p $(2); cp $< $(2) -install-dir = $(patsubst $(dtbinst_root)%,$(INSTALL_DTBS_PATH)%,$(obj)) - $(dtbinst-files): %.dtb: $(obj)/%.dtb - $(call cmd,dtb_install,$(install-dir)) + $(call cmd,dtb_install,$(dst)) $(dtbinst-dirs): - $(Q)$(MAKE) $(dtbinst)=$(obj)/$@ + $(Q)$(MAKE) $(dtbinst)=$(obj)/$@ dst=$(dst)/$@ PHONY += $(dtbinst-files) $(dtbinst-dirs) __dtbs_install: $(dtbinst-files) $(dtbinst-dirs) From patchwork Fri Mar 6 17:08:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11424413 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 128F8138D for ; Fri, 6 Mar 2020 17:09:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DD51B20658 for ; Fri, 6 Mar 2020 17:09:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583514574; bh=Ay0r5iLHm/f+Z5s3uqNDUoAcMW0loAnz8Fw52JkMqgw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=e1mUepOUMWZVoND1lXMJuw7qFUUBMfocUSMFSGhEq62vcwDLci58/gw+0P5lHHjs4 QA8xk/9UpLceNF4tAj2m88rkaWg7mcSgdACHb1Hn/CouFvOAL22xMIL0Z3ddm+YG77 uUlQjvLt0Cozp1QqZZHjtEI71Cmk1mDzFaetaBoQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726979AbgCFRJC (ORCPT ); Fri, 6 Mar 2020 12:09:02 -0500 Received: from conuserg-11.nifty.com ([210.131.2.78]:31050 "EHLO conuserg-11.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726271AbgCFRJB (ORCPT ); Fri, 6 Mar 2020 12:09:01 -0500 Received: from grover.flets-west.jp (softbank126093102113.bbtec.net [126.93.102.113]) (authenticated) by conuserg-11.nifty.com with ESMTP id 026H8r3Y022896; Sat, 7 Mar 2020 02:08:54 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com 026H8r3Y022896 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1583514535; bh=6guOWuBDvMw4PWtQqkZ3oG+qxRjsz1p8ylustGTOkRc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hKtYra30kFqdKeNcrhQ5uWZO+Iq4r9PNT5s5gQUO340oYIRCi75X1EU8mg/9bND4n v9EyO9JOaNbQqr6Ejf4ttA8VdWf6YfRHjpbeIIX4y3ZbcJkHjpM7aZsfx1M8LMUF2N arBCL4Pv9iaoRNiG4IPictaFdf/cyXhlbyJUmhqx1io/KaZZq1fEoPOzciycyPuHY4 IyqIMFvyVTOO6FQeFbIJV2XSOHayW0i7kcPynW2kx1EJzCujeAypsJhsMwvSMHyuXt 8ezBXPfPBbcz/ygac5N5E9tbIZTQCVRabS8N3e7YQ8qoKBYyYZTm5Ps2VyFYyJKn65 wfxvzK04L/4MQ== X-Nifty-SrcIP: [126.93.102.113] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Michal Marek Subject: [PATCH 2/2] kbuild: refactor Makefile.dtbinst more Date: Sat, 7 Mar 2020 02:08:52 +0900 Message-Id: <20200306170852.17798-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200306170852.17798-1-masahiroy@kernel.org> References: <20200306170852.17798-1-masahiroy@kernel.org> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Refactor Makefile.dtbinst so it looks similar to other Makefiles. *.dtb should not be a phony target. Copy files based on the timestamps. Print installed dtb paths instead of in-kernel dtb paths. Signed-off-by: Masahiro Yamada --- scripts/Makefile.dtbinst | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst index fcd5f2eaaad1..50d580d77ae9 100644 --- a/scripts/Makefile.dtbinst +++ b/scripts/Makefile.dtbinst @@ -17,20 +17,20 @@ include include/config/auto.conf include scripts/Kbuild.include include $(src)/Makefile -dtbinst-files := $(sort $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS), $(dtb-))) -dtbinst-dirs := $(subdir-y) $(subdir-m) +dtbs := $(addprefix $(dst)/, $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS),$(dtb-))) +subdirs := $(addprefix $(obj)/, $(subdir-y) $(subdir-m)) -# Helper targets for Installing DTBs into the boot directory -quiet_cmd_dtb_install = INSTALL $< - cmd_dtb_install = mkdir -p $(2); cp $< $(2) +__dtbs_install: $(dtbs) $(subdirs) + @: -$(dtbinst-files): %.dtb: $(obj)/%.dtb - $(call cmd,dtb_install,$(dst)) +quiet_cmd_dtb_install = INSTALL $@ + cmd_dtb_install = install -D $< $@ -$(dtbinst-dirs): - $(Q)$(MAKE) $(dtbinst)=$(obj)/$@ dst=$(dst)/$@ +$(dst)/%.dtb: $(obj)/%.dtb + $(call cmd,dtb_install) -PHONY += $(dtbinst-files) $(dtbinst-dirs) -__dtbs_install: $(dtbinst-files) $(dtbinst-dirs) +PHONY += $(subdirs) +$(subdirs): + $(Q)$(MAKE) $(dtbinst)=$@ dst=$(patsubst $(obj)/%,$(dst)/%,$@) .PHONY: $(PHONY)