From patchwork Tue Aug 2 14:31:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 1029472 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p72EWAH8006076 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 2 Aug 2011 14:32:31 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QoG0k-0005CX-4R; Tue, 02 Aug 2011 14:31:58 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QoG0j-0005HO-L1; Tue, 02 Aug 2011 14:31:57 +0000 Received: from mail-wy0-f177.google.com ([74.125.82.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QoG0g-0005H5-Nv for linux-arm-kernel@lists.infradead.org; Tue, 02 Aug 2011 14:31:55 +0000 Received: by wyf23 with SMTP id 23so2607684wyf.36 for ; Tue, 02 Aug 2011 07:31:51 -0700 (PDT) Received: by 10.227.32.74 with SMTP id b10mr5413708wbd.33.1312295510830; Tue, 02 Aug 2011 07:31:50 -0700 (PDT) Received: from localhost ([109.234.204.184]) by mx.google.com with ESMTPS id gb1sm5071696wbb.3.2011.08.02.07.31.49 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Aug 2011 07:31:49 -0700 (PDT) Received: from [127.0.1.1] (localhost [127.0.0.1]) by localhost (Postfix) with ESMTP id 7BA7918085F; Tue, 2 Aug 2011 15:31:48 +0100 (BST) Subject: [PATCH] Build a uImage with dtb already appended To: niklas.hernaeus@linaro.org, nicolas.ferre@atmel.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org From: Grant Likely Date: Tue, 02 Aug 2011 15:31:48 +0100 Message-ID: <20110802143148.21599.22870.stgit@ponder> User-Agent: StGit/0.15 MIME-Version: 1.0 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110802_103154_961703_D33A41A2 X-CRM114-Status: GOOD ( 12.33 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.177 listed in list.dnswl.org] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 02 Aug 2011 14:32:31 +0000 (UTC) Do not commit to mainline; this is a useful hack only for now. Signed-off-by: Grant Likely --- arch/arm/Makefile | 3 +++ arch/arm/boot/Makefile | 8 ++++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 70c424e..0677b86 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -282,6 +282,9 @@ zImage Image xipImage bootpImage uImage: vmlinux zinstall uinstall install: vmlinux $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ +uImage-dtb.%: + $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ + %.dtb: $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index a1edfd5..a64493b 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -57,6 +57,9 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE $(call if_changed,objcopy) @echo ' Kernel: $@ is ready' +$(obj)/zImage-dtb.%: $(obj)/%.dtb $(obj)/zImage + cat $(obj)/zImage $< > $@ + endif # Rule to build device tree blobs @@ -77,11 +80,16 @@ $(obj)/uImage: LOADADDR=$(ZRELADDR) endif $(obj)/uImage: STARTADDR=$(LOADADDR) +$(obj)/uImage-dtb.%: STARTADDR=$(LOADADDR) $(obj)/uImage: $(obj)/zImage FORCE $(call if_changed,uimage) @echo ' Image $@ is ready' +$(obj)/uImage-dtb.%: $(obj)/zImage-dtb.% FORCE + $(call if_changed,uimage) + @echo ' Image $@ is ready' + $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE $(Q)$(MAKE) $(build)=$(obj)/bootp $@ @: