From patchwork Fri Sep 5 06:48:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 4850131 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1155EC0338 for ; Fri, 5 Sep 2014 06:51:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1CECF201FB for ; Fri, 5 Sep 2014 06:51:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4314A2017E for ; Fri, 5 Sep 2014 06:51:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XPnKt-0004sd-GR; Fri, 05 Sep 2014 06:49:31 +0000 Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XPnKc-0004UI-Ur for linux-arm-kernel@lists.infradead.org; Fri, 05 Sep 2014 06:49:15 +0000 Received: by mail-wi0-f179.google.com with SMTP id q5so2404794wiv.0 for ; Thu, 04 Sep 2014 23:48:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=hA0OlOectPBocR+t3CsSUZFLmi9EDeZz7ALj7cT1kaA=; b=uM44uba9yfyaOgU+uQ/VuVuj9UT4zX0TcpUUYYkD+l7sk02yp/2W2LJd+mQ/+CykEP ZutnWmdzbgMfsXEmPXVN5Dm94XqslMFm30KJy3ZXRNUtqDzfI6KkyQcRMpG/LKJqdsJK FUYnj5Q8Vxg1lN14by4KNXT4e2bqLOSwvsyfxb/N5GgsJGqdn3VkODpJj4dc6YnOb/4H f1XHaWtjULC4bHHRXMiCXNXQMXfwPefwRDxKvX7EaxAsLMeZsOZpaVZq/sAEB6sCRzFK 1l6q9/0DTXIY05wtrWqXBJnF5ms8KHBAqrVihvHIahXg96T/5vohAXmwjJ57uDVgD7Ye 4i8w== X-Received: by 10.181.8.69 with SMTP id di5mr1371995wid.6.1409899734301; Thu, 04 Sep 2014 23:48:54 -0700 (PDT) Received: from rric.localhost (g224199072.adsl.alicedsl.de. [92.224.199.72]) by mx.google.com with ESMTPSA id au4sm403541wjc.15.2014.09.04.23.48.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Sep 2014 23:48:53 -0700 (PDT) From: Robert Richter To: Olof Johansson , Rob Herring , Mark Rutland , Arnd Bergmann , Michal Marek Subject: [PATCH 3/6] dts, arm/arm64: Remove dtbs build rules in sub-makes Date: Fri, 5 Sep 2014 08:48:09 +0200 Message-Id: <1409899692-1455-4-git-send-email-rric@kernel.org> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1409899692-1455-1-git-send-email-rric@kernel.org> References: <1409899692-1455-1-git-send-email-rric@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140904_234915_143146_85B9F4DA X-CRM114-Status: GOOD ( 10.83 ) X-Spam-Score: -0.7 (/) Cc: Robert Richter , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kbuild@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-3.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Robert Richter 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 --- 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