Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934445Ab0KQGcv (ORCPT ); Wed, 17 Nov 2010 01:32:51 -0500 Received: from mail-iw0-f174.google.com ([209.85.214.174]:53841 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933323Ab0KQGct (ORCPT ); Wed, 17 Nov 2010 01:32:49 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=djRUtijtoC9JkZus4EmfxsWdrAP488aCc9X1XUjKsg+ZDsxWztkT7Fxec1LiJhTNn6 kovkb69NZcH06b1uBoEKYCzd/yTVqQPsYB+rYqM84V1Wn04eCVatDdpiEtZn0jPVe5VU DQQpNlfJjpbiznToqF/7/Xd1Kl7vubDuXRhAI= Message-ID: <4CE3770E.70506@gmail.com> Date: Tue, 16 Nov 2010 22:32:46 -0800 From: Dirk Brandewie User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.12) Gecko/20101027 Fedora/3.1.6-1.fc13 Thunderbird/3.1.6 MIME-Version: 1.0 To: Grant Likely CC: devicetree-discuss@lists.ozlabs.org, linux-arch@vger.kernel.org, linux-kbuild@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, sodaville@linutronix.de, microblaze-uclinux@itee.uq.edu.au, arjan@linux.intel.com Subject: Re: [PATCH 4/5] of/powerpc: Move build to use generic dts->dtb rule References: <20101117060653.GI12813@angua.secretlab.ca> In-Reply-To: <20101117060653.GI12813@angua.secretlab.ca> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2920 Lines: 75 On 11/16/2010 10:06 PM, Grant Likely wrote: > On Tue, Nov 16, 2010 at 02:41:39PM -0800, dirk.brandewie@gmail.com wrote: >> From: Dirk Brandewie >> >> This patch changes arch/powerpc/boot/Makefile to use the generic >> rule build the device tree blobs in scripts/Makefile.lib >> >> Signed-off-by: Dirk Brandewie >> --- >> arch/powerpc/boot/Makefile | 7 ------- >> 1 files changed, 0 insertions(+), 7 deletions(-) >> >> diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile >> index fae8192..d90c674 100644 >> --- a/arch/powerpc/boot/Makefile >> +++ b/arch/powerpc/boot/Makefile >> @@ -147,8 +147,6 @@ targets += $(patsubst $(obj)/%,%,$(obj-boot) wrapper.a) >> extra-y := $(obj)/wrapper.a $(obj-plat) $(obj)/empty.o \ >> $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds >> >> -dtstree := $(srctree)/$(src)/dts >> - >> wrapper :=$(srctree)/$(src)/wrapper >> wrapperbits := $(extra-y) $(addprefix $(obj)/,addnote hack-coff mktree) \ >> $(wrapper) FORCE >> @@ -331,11 +329,6 @@ $(obj)/treeImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits) >> $(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits) >> $(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb) >> >> -# Rule to build device tree blobs >> -DTC = $(objtree)/scripts/dtc/dtc >> - >> -$(obj)/%.dtb: $(dtstree)/%.dts >> - $(DTC) -O dtb -o $(obj)/$*.dtb -b 0 $(DTS_FLAGS) $(dtstree)/$*.dts > > This patch needs to modify the rules that have %.dtb dependencies to > go looking in arch/powerpc/boot/dts instead of arch/powerpc/boot > because the rule change will change where .dtb files get generated. The rule in patch 1 takes of this. The dts directory is relative to the arch/powerpc/boot/Makefile +quiet_cmd_dtc = DTC $@ + cmd_dtc = $(DTC) -O dtb -o $(obj)/$*.dtb -b 0 $(DTS_FLAGS) $(src)/dts/$*.dts + > > Also, this patch and patch 5 need to be merged with patch 1 so that > the series remains bisectable. I tested building a powerpc image with patch 1 applied and patch 4 unapplied and the image built without errors and the dtb was present in the wrapped image. unfortunately I don't have a system to do runtime testing. I could not build the uboot image type I am missing mkimage. I did build the dtbImage, zImage and cuImage types before and after this patch was applied. --Dirk > > g. > >> >> # If there isn't a platform selected then just strip the vmlinux. >> ifeq (,$(image-y)) >> -- >> 1.7.2.3 >> >> _______________________________________________ >> devicetree-discuss mailing list >> devicetree-discuss@lists.ozlabs.org >> https://lists.ozlabs.org/listinfo/devicetree-discuss -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/