linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: rric@kernel.org (Robert Richter)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/6] dts, arm/arm64: Remove dtbs build rules in sub-makes
Date: Fri,  5 Sep 2014 08:48:09 +0200	[thread overview]
Message-ID: <1409899692-1455-4-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>

Add dtb files to build targets and let kbuild handle them. Thus,
special dtbs rules can be removed. This eases Makefiles and the
implementation of the support of vendor dtb subdirectories.

Signed-off-by: Robert Richter <rrichter@cavium.com>
---
 arch/arm/Makefile            |  2 +-
 arch/arm/boot/dts/Makefile   | 10 ++--------
 arch/arm64/Makefile          |  2 +-
 arch/arm64/boot/dts/Makefile |  8 ++------
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 1963d9a9a2c4..4d13c6d0a0cc 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -315,7 +315,7 @@ $(BOOT_TARGETS): vmlinux
 PHONY += dtbs dtbs_install
 
 dtbs: prepare scripts
-	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $@
+	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE)
 
 dtbs_install:
 	$(Q)$(MAKE) $(dtbinst)=$(boot)/dts MACHINE=$(MACHINE)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index ab40afb87fb2..cb63c515247c 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -492,13 +492,7 @@ dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
 	dove-d3plug.dtb \
 	dove-dove-db.dtb
 
-targets += dtbs dtbs_install
-targets += $(dtb-y)
 endif
 
-# *.dtb used to be generated in the directory above. Clean out the
-# old build results so people don't accidentally use them.
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-	$(Q)rm -f $(obj)/../*.dtb
-
-clean-files := *.dtb
+always		:= $(dtb-y)
+clean-files	:= *.dtb
diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile
index 1627861e9bbd..c21b21d6e72d 100644
--- a/arch/arm64/Makefile
+++ b/arch/arm64/Makefile
@@ -74,7 +74,7 @@ zinstall install: vmlinux
 PHONY += dtbs dtbs_install
 
 dtbs: prepare scripts
-	$(Q)$(MAKE) $(build)=$(boot)/dts $@
+	$(Q)$(MAKE) $(build)=$(boot)/dts
 
 dtbs_install:
 	$(Q)$(MAKE) $(dtbinst)=$(boot)/dts
diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
index 0a14c3828301..d116da5f2f20 100644
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -1,9 +1,5 @@
 dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb foundation-v8.dtb
 dtb-$(CONFIG_ARCH_XGENE) += apm-mustang.dtb
 
-targets += dtbs dtbs_install
-targets += $(dtb-y)
-
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-
-clean-files := *.dtb
+always		:= $(dtb-y)
+clean-files	:= *.dtb
-- 
2.0.1

  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 ` Robert Richter [this message]
2014-09-05  6:48 ` [PATCH 4/6] dts, kbuild: Implement support for dtb vendor subdirs Robert Richter
2014-09-05  6:48 ` [PATCH 5/6] dts, arm64: Move dts files to " 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-4-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).