From patchwork Tue Oct 9 07:32:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roese X-Patchwork-Id: 190235 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 5801A2C00B9 for ; Tue, 9 Oct 2012 18:34:09 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2C79E280AC; Tue, 9 Oct 2012 09:33:50 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VIeZFlC9KodV; Tue, 9 Oct 2012 09:33:49 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 03B3128091; Tue, 9 Oct 2012 09:33:24 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4242F280B7 for ; Tue, 9 Oct 2012 09:33:19 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mK7ux8iLSoOB for ; Tue, 9 Oct 2012 09:33:17 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mo-p05-ob.rzone.de (mo-p05-ob.rzone.de [81.169.146.182]) by theia.denx.de (Postfix) with ESMTPS id B5CDC2809D for ; Tue, 9 Oct 2012 09:32:54 +0200 (CEST) X-RZG-AUTH: :IW0NeWC7b/q2i6W/qstXb1SBUuFnrGohdvpEkce+Ub4+ReKfHD+mCZKG5kE89A== X-RZG-CLASS-ID: mo05 Received: from ubuntu-2012.fritz.box (p57B9407E.dip.t-dialin.net [87.185.64.126]) by smtp.strato.de (jored mo39) (RZmta 30.20 DYNA|AUTH) with ESMTPA id q06aado99713BL ; Tue, 9 Oct 2012 09:32:50 +0200 (CEST) From: Stefan Roese To: u-boot@lists.denx.de Date: Tue, 9 Oct 2012 09:32:33 +0200 Message-Id: <1349767953-25321-8-git-send-email-sr@denx.de> X-Mailer: git-send-email 1.7.12.2 In-Reply-To: <1349767953-25321-1-git-send-email-sr@denx.de> References: <1349767953-25321-1-git-send-email-sr@denx.de> Cc: Tom Rini Subject: [U-Boot] [PATCH v4 7/7] Makefile: Add target for combined spl/u-boot.bin & u-boot.img X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de This new make target "u-boot-img.bin" consists of the U-Boot SPL image with the real, full-blown U-Boot image directly attached to it. The full-blown U-Boot image has the mkimage header included, with its load-address and entry-point. This will be used by the upcoming a3m071 MPC5200 board port. Signed-off-by: Stefan Roese --- Changes in v4: - Drop patch fdt: cmd_fdt: Call fdt_chosen() from "fdt boardsetup" Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 0dc24d2..468986a 100644 --- a/Makefile +++ b/Makefile @@ -515,6 +515,9 @@ $(obj)u-boot-nodtb-tegra.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.bin endif endif +$(obj)u-boot-img.bin: $(obj)spl/u-boot-spl.bin $(obj)u-boot.img + cat $(obj)spl/u-boot-spl.bin $(obj)u-boot.img > $@ + ifeq ($(CONFIG_SANDBOX),y) GEN_UBOOT = \ cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \