From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Warren Subject: [PATCH V7 3/7] arm64: use new common dtc rule Date: Tue, 27 Nov 2012 16:29:12 -0700 Message-ID: <1354058956-7199-3-git-send-email-swarren@wwwdotorg.org> References: <1354058956-7199-1-git-send-email-swarren@wwwdotorg.org> Return-path: In-Reply-To: <1354058956-7199-1-git-send-email-swarren@wwwdotorg.org> Sender: linux-kernel-owner@vger.kernel.org To: Michal Marek , Grant Likely , Rob Herring Cc: Sam Ravnborg , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Stephen Warren , Catalin Marinas , linux-arm-kernel@lists.infradead.org List-Id: linux-arch.vger.kernel.org From: Stephen Warren The current rules have the .dtb files build in a different directory from the .dts files. This patch changes arm64 to use the generic dtb rule which builds .dtb files in the same directory as the source .dts. This requires moving parts of arch/arm64/boot/Makefile into newly created arch/arm64/boot/dts/Makefile, and updating arch/arm64/Makefile to call the new Makefile. Cc: Catalin Marinas Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Stephen Warren --- v7: New patch. --- arch/arm64/Makefile | 2 +- arch/arm64/boot/Makefile | 5 ----- arch/arm64/boot/dts/Makefile | 5 +++++ 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 arch/arm64/boot/dts/Makefile diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 364191f..fd3d4a1 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -54,7 +54,7 @@ zinstall install: vmlinux $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ %.dtb: - $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ # We use MRPROPER_FILES and CLEAN_FILES now archclean: diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index eca209b..5a0e3ab 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -22,9 +22,6 @@ $(obj)/Image: vmlinux FORCE $(obj)/Image.gz: $(obj)/Image FORCE $(call if_changed,gzip) -$(obj)/%.dtb: $(src)/dts/%.dts - $(call cmd,dtc) - install: $(obj)/Image $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ $(obj)/Image System.map "$(INSTALL_PATH)" @@ -32,5 +29,3 @@ install: $(obj)/Image zinstall: $(obj)/Image.gz $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ $(obj)/Image.gz System.map "$(INSTALL_PATH)" - -clean-files += *.dtb diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile new file mode 100644 index 0000000..801e2d7 --- /dev/null +++ b/arch/arm64/boot/dts/Makefile @@ -0,0 +1,5 @@ +targets += dtbs + +dtbs: $(addprefix $(obj)/, $(dtb-y)) + +clean-files := *.dtb -- 1.7.10.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from avon.wwwdotorg.org ([70.85.31.133]:39036 "EHLO avon.wwwdotorg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754274Ab2K0X3e (ORCPT ); Tue, 27 Nov 2012 18:29:34 -0500 From: Stephen Warren Subject: [PATCH V7 3/7] arm64: use new common dtc rule Date: Tue, 27 Nov 2012 16:29:12 -0700 Message-ID: <1354058956-7199-3-git-send-email-swarren@wwwdotorg.org> In-Reply-To: <1354058956-7199-1-git-send-email-swarren@wwwdotorg.org> References: <1354058956-7199-1-git-send-email-swarren@wwwdotorg.org> Sender: linux-arch-owner@vger.kernel.org List-ID: To: Michal Marek , Grant Likely , Rob Herring Cc: Sam Ravnborg , linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, Stephen Warren , Catalin Marinas , linux-arm-kernel@lists.infradead.org Message-ID: <20121127232912.R-PqiFIZVgomPWPr_PbDGiNIC2oQijkPm4TXSMVbR9E@z> From: Stephen Warren The current rules have the .dtb files build in a different directory from the .dts files. This patch changes arm64 to use the generic dtb rule which builds .dtb files in the same directory as the source .dts. This requires moving parts of arch/arm64/boot/Makefile into newly created arch/arm64/boot/dts/Makefile, and updating arch/arm64/Makefile to call the new Makefile. Cc: Catalin Marinas Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Stephen Warren --- v7: New patch. --- arch/arm64/Makefile | 2 +- arch/arm64/boot/Makefile | 5 ----- arch/arm64/boot/dts/Makefile | 5 +++++ 3 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 arch/arm64/boot/dts/Makefile diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 364191f..fd3d4a1 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -54,7 +54,7 @@ zinstall install: vmlinux $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ %.dtb: - $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ + $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ # We use MRPROPER_FILES and CLEAN_FILES now archclean: diff --git a/arch/arm64/boot/Makefile b/arch/arm64/boot/Makefile index eca209b..5a0e3ab 100644 --- a/arch/arm64/boot/Makefile +++ b/arch/arm64/boot/Makefile @@ -22,9 +22,6 @@ $(obj)/Image: vmlinux FORCE $(obj)/Image.gz: $(obj)/Image FORCE $(call if_changed,gzip) -$(obj)/%.dtb: $(src)/dts/%.dts - $(call cmd,dtc) - install: $(obj)/Image $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ $(obj)/Image System.map "$(INSTALL_PATH)" @@ -32,5 +29,3 @@ install: $(obj)/Image zinstall: $(obj)/Image.gz $(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \ $(obj)/Image.gz System.map "$(INSTALL_PATH)" - -clean-files += *.dtb diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile new file mode 100644 index 0000000..801e2d7 --- /dev/null +++ b/arch/arm64/boot/dts/Makefile @@ -0,0 +1,5 @@ +targets += dtbs + +dtbs: $(addprefix $(obj)/, $(dtb-y)) + +clean-files := *.dtb -- 1.7.10.4