From: Rob Herring <robh@kernel.org>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: linux-kbuild@vger.kernel.org, devicetree@vger.kernel.org,
Simon Glass <sjg@chromium.org>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Nicolas Schier <nicolas@fjasle.eu>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/4] kbuild: simplify dtbs_install by reading the list of compiled DTBs
Date: Wed, 17 Jan 2024 08:52:16 -0600 [thread overview]
Message-ID: <20240117145216.GA2296118-robh@kernel.org> (raw)
In-Reply-To: <20240109120738.346061-3-masahiroy@kernel.org>
On Tue, Jan 09, 2024 at 09:07:35PM +0900, Masahiro Yamada wrote:
> Retrieve the list of *.dtb(o) files from arch/*/boot/dts/dtbs-list
> instead of traversing the directory tree again.
Don't you need dtbs-list in .gitignore?
>
> Please note that 'make dtbs_install' installs *.dtb(o) files directly
> added to dtb-y because scripts/Makefile.dtbinst installs $(dtb-y)
> without expanding the -dtbs suffix.
>
> This commit preserves this behavior.
>
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>
> Makefile | 2 +-
> scripts/Kbuild.include | 6 ------
> scripts/Makefile.dtbinst | 32 ++++++++++++++++++--------------
> 3 files changed, 19 insertions(+), 21 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index db7f9e34a24e..dae6825b8082 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1407,7 +1407,7 @@ endif
> dtbs_check: dtbs
>
> dtbs_install:
> - $(Q)$(MAKE) $(dtbinst)=$(dtstree) dst=$(INSTALL_DTBS_PATH)
> + $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.dtbinst obj=$(dtstree)
>
> ifdef CONFIG_OF_EARLY_FLATTREE
> all: dtbs
> diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
> index 7778cc97a4e0..2f331879816b 100644
> --- a/scripts/Kbuild.include
> +++ b/scripts/Kbuild.include
> @@ -113,12 +113,6 @@ endef
> # $(Q)$(MAKE) $(build)=dir
> build := -f $(srctree)/scripts/Makefile.build obj
>
> -###
> -# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.dtbinst obj=
> -# Usage:
> -# $(Q)$(MAKE) $(dtbinst)=dir
> -dtbinst := -f $(srctree)/scripts/Makefile.dtbinst obj
> -
> ###
> # Shorthand for $(Q)$(MAKE) -f scripts/Makefile.clean obj=
> # Usage:
> diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
> index 4405d5b67578..67956f6496a5 100644
> --- a/scripts/Makefile.dtbinst
> +++ b/scripts/Makefile.dtbinst
> @@ -8,32 +8,36 @@
> # $INSTALL_PATH/dtbs/$KERNELRELEASE
> # ==========================================================================
>
> -src := $(obj)
> -
> PHONY := __dtbs_install
> __dtbs_install:
>
> include include/config/auto.conf
> include $(srctree)/scripts/Kbuild.include
> -include $(kbuild-file)
>
> -dtbs := $(addprefix $(dst)/, $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS),$(dtb-)))
> -subdirs := $(addprefix $(obj)/, $(subdir-y) $(subdir-m))
> -
> -__dtbs_install: $(dtbs) $(subdirs)
> - @:
> +dst := $(INSTALL_DTBS_PATH)
>
> quiet_cmd_dtb_install = INSTALL $@
> cmd_dtb_install = install -D $< $@
>
> -$(dst)/%.dtb: $(obj)/%.dtb
> +$(dst)/%: $(obj)/%
> $(call cmd,dtb_install)
>
> -$(dst)/%.dtbo: $(obj)/%.dtbo
> - $(call cmd,dtb_install)
> +dtbs := $(patsubst $(obj)/%,%,$(call read-file, $(obj)/dtbs-list))
>
> -PHONY += $(subdirs)
> -$(subdirs):
> - $(Q)$(MAKE) $(dtbinst)=$@ dst=$(if $(CONFIG_ARCH_WANT_FLAT_DTB_INSTALL),$(dst),$(patsubst $(obj)/%,$(dst)/%,$@))
> +ifdef CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
> +
> +define gen_install_rules
> +$(dst)/%: $(obj)/$(1)%
> + $$(call cmd,dtb_install)
> +endef
> +
> +$(foreach d, $(sort $(dir $(dtbs))), $(eval $(call gen_install_rules,$(d))))
> +
> +dtbs := $(notdir $(dtbs))
> +
> +endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL
> +
> +__dtbs_install: $(addprefix $(dst)/, $(dtbs))
> + @:
>
> .PHONY: $(PHONY)
> --
> 2.40.1
>
next prev parent reply other threads:[~2024-01-17 14:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-09 12:07 [PATCH 0/4] kbuild: create a list of DTBs and allow to install base dtb and overlays Masahiro Yamada
2024-01-09 12:07 ` [PATCH 1/4] kbuild: create a list of all built DTB files Masahiro Yamada
2024-01-09 14:22 ` Masahiro Yamada
2024-01-09 12:07 ` [PATCH 2/4] kbuild: simplify dtbs_install by reading the list of compiled DTBs Masahiro Yamada
2024-01-17 14:52 ` Rob Herring [this message]
2024-01-19 5:30 ` Masahiro Yamada
2024-01-09 12:07 ` [PATCH 3/4] kbuild: create a list of base and overlays for each DTB Masahiro Yamada
2024-01-09 12:07 ` [PATCH 4/4] kbuild: allow 'make dtbs_install' to install primitive DTBs Masahiro Yamada
2024-01-17 15:37 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240117145216.GA2296118-robh@kernel.org \
--to=robh@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nicolas@fjasle.eu \
--cc=sjg@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).