From: rric@kernel.org (Robert Richter)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/6] dts, kbuild: Implement support for dtb vendor subdirs
Date: Fri, 5 Sep 2014 08:48:10 +0200 [thread overview]
Message-ID: <1409899692-1455-5-git-send-email-rric@kernel.org> (raw)
In-Reply-To: <1409899692-1455-1-git-send-email-rric@kernel.org>
From: Robert Richter <rrichter@cavium.com>
This patch adds support of vendor sub directories for dtb files.
Subdirectories can be specified in $(dts-dirs). Kbuild traverses over
all directories while building and installing dtb files. The directory
tree is also reflected in the install path.
Signed-off-by: Robert Richter <rrichter@cavium.com>
---
arch/arm64/boot/dts/Makefile | 1 +
scripts/Makefile.dtbinst | 23 ++++++++++++++++++-----
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
index d116da5f2f20..9b8622532068 100644
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -2,4 +2,5 @@ dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb
dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb
always := $(dtb-y)
+subdir-y := $(dts-dirs)
clean-files := *.dtb
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
index 54286cccc289..909ed7a2ac61 100644
--- a/scripts/Makefile.dtbinst
+++ b/scripts/Makefile.dtbinst
@@ -6,6 +6,7 @@
#
# $INSTALL_PATH/dtbs/$KERNELRELEASE
#
+# Traverse through subdirectories listed in $(dts-dirs).
# ==========================================================================
src := $(obj)
@@ -13,26 +14,38 @@ src := $(obj)
PHONY := __dtbs_install
__dtbs_install:
+export dtbinst-root ?= $(obj)
+
include include/config/auto.conf
include scripts/Kbuild.include
include $(srctree)/$(obj)/Makefile
PHONY += __dtbs_install_prep
__dtbs_install_prep:
+ifeq ("$(dtbinst-root)", "$(obj)")
$(Q)if [ -d $(INSTALL_DTBS_PATH).old ]; then rm -rf $(INSTALL_DTBS_PATH).old; fi
$(Q)if [ -d $(INSTALL_DTBS_PATH) ]; then mv $(INSTALL_DTBS_PATH) $(INSTALL_DTBS_PATH).old; fi
$(Q)mkdir -p $(INSTALL_DTBS_PATH)
+endif
dtbinst-files := $(dtb-y)
+dtbinst-dirs := $(dts-dirs)
# Helper targets for Installing DTBs into the boot directory
quiet_cmd_dtb_install = INSTALL $<
- cmd_dtb_install = cp $< $(2)
+ cmd_dtb_install = mkdir -p $(2); cp $< $(2)
+
+install-dir = $(patsubst $(dtbinst-root)%,$(INSTALL_DTBS_PATH)%,$(obj))
+
+$(dtbinst-files) $(dtbinst-dirs): | __dtbs_install_prep
+
+$(dtbinst-files): %.dtb: $(obj)/%.dtb
+ $(call cmd,dtb_install,$(install-dir))
-$(dtbinst-files): %.dtb: $(obj)/%.dtb | __dtbs_install_prep
- $(call cmd,dtb_install,$(INSTALL_DTBS_PATH))
+$(dtbinst-dirs):
+ $(Q)$(MAKE) $(dtbinst)=$(obj)/$@
-PHONY += $(dtbinst-files)
-__dtbs_install: $(dtbinst-files)
+PHONY += $(dtbinst-files) $(dtbinst-dirs)
+__dtbs_install: $(dtbinst-files) $(dtbinst-dirs)
.PHONY: $(PHONY)
--
2.0.1
next prev parent reply other threads:[~2014-09-05 6:48 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-05 6:48 [PATCH 0/6] dts, kbuild: Implement support for dtb vendor subdirs Robert Richter
2014-09-05 6:48 ` [PATCH 1/6] dts, arm64: Add dtbs_install make target Robert Richter
2014-09-05 6:48 ` [PATCH 2/6] dts, kbuild: Factor out dtbs install rules to Makefile.dtbinst Robert Richter
2014-09-05 12:48 ` Rob Herring
2014-09-08 7:14 ` Robert Richter
2014-09-05 6:48 ` [PATCH 3/6] dts, arm/arm64: Remove dtbs build rules in sub-makes Robert Richter
2014-09-05 6:48 ` Robert Richter [this message]
2014-09-05 6:48 ` [PATCH 5/6] dts, arm64: Move dts files to vendor subdirs Robert Richter
2014-09-05 12:46 ` Rob Herring
2014-09-05 6:48 ` [PATCH 6/6] dts, arm: Remove $(MACHINE) variable from dtbs make recipes Robert Richter
2014-09-17 3:49 ` [PATCH 0/6] dts, kbuild: Implement support for dtb vendor subdirs Andrew Bresticker
2014-09-19 12:30 ` Robert Richter
2014-09-19 14:08 ` Catalin Marinas
2014-09-23 11:26 ` Robert Richter
2014-10-02 15:08 ` [GIT PULL] " Robert Richter
2014-10-20 13:56 ` Abhilash Kesavan
2014-10-20 15:24 ` Robert Richter
2014-10-21 18:15 ` Robert Richter
2014-10-30 19:26 ` Robert Richter
2014-11-04 4:47 ` Olof Johansson
2014-11-04 15:49 ` Robert Richter
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=1409899692-1455-5-git-send-email-rric@kernel.org \
--to=rric@kernel.org \
--cc=linux-arm-kernel@lists.infradead.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).