From patchwork Tue Aug 2 15:33:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Ferre X-Patchwork-Id: 1029552 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p72FXqCA021877 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 2 Aug 2011 15:34:13 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QoGyR-00078Y-Mq; Tue, 02 Aug 2011 15:33:39 +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 1QoGyR-0005v8-8m; Tue, 02 Aug 2011 15:33:39 +0000 Received: from newsmtp5.atmel.com ([204.2.163.5] helo=sjogate2.atmel.com) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QoGyO-0005ur-Lj for linux-arm-kernel@lists.infradead.org; Tue, 02 Aug 2011 15:33:37 +0000 Received: from meyreuil.atmel.fr ([10.159.254.132]) by sjogate2.atmel.com (8.13.6/8.13.6) with ESMTP id p72FUFu0013480; Tue, 2 Aug 2011 08:30:16 -0700 (PDT) Received: from ubuntu.atmel.com ([172.24.48.83]) by meyreuil.atmel.fr (8.11.7p1+Sun/8.11.7) with ESMTP id p72FXSe15915; Tue, 2 Aug 2011 17:33:28 +0200 (MEST) From: Nicolas Ferre To: grant.likely@secretlab.ca, niklas.hernaeus@linaro.org Subject: [PATCH] fix for: Build a uImage with dtb already appended Date: Tue, 2 Aug 2011 16:33:27 +0100 Message-Id: <1312299207-12735-1-git-send-email-nicolas.ferre@atmel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <20110802143148.21599.22870.stgit@ponder> References: <20110802143148.21599.22870.stgit@ponder> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110802_113336_929681_2F838A51 X-CRM114-Status: UNSURE ( 8.12 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.8 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: Nicolas Ferre , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.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: , MIME-Version: 1.0 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 (demeter1.kernel.org [140.211.167.41]); Tue, 02 Aug 2011 15:34:30 +0000 (UTC) --- arch/arm/boot/Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile index a64493b..68d6f23 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -75,8 +75,10 @@ quiet_cmd_uimage = UIMAGE $@ ifeq ($(CONFIG_ZBOOT_ROM),y) $(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT) +$(obj)/uImage-dtb.%: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT) else $(obj)/uImage: LOADADDR=$(ZRELADDR) +$(obj)/uImage-dtb.%: LOADADDR=$(ZRELADDR) endif $(obj)/uImage: STARTADDR=$(LOADADDR)