From patchwork Fri Oct 17 08:00:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Wang X-Patchwork-Id: 400433 X-Patchwork-Delegate: yorksun@freescale.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 A3F871400BE for ; Fri, 17 Oct 2014 19:01:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6C828A73F7; Fri, 17 Oct 2014 10:01:38 +0200 (CEST) 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 EO2uiwlvKp22; Fri, 17 Oct 2014 10:01:38 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 71B99A73F9; Fri, 17 Oct 2014 10:01:34 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 971B04B5E4 for ; Fri, 17 Oct 2014 10:01:27 +0200 (CEST) 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 gveDVYDT8aq0 for ; Fri, 17 Oct 2014 10:01:27 +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 na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0112.outbound.protection.outlook.com [65.55.169.112]) by theia.denx.de (Postfix) with ESMTPS id 1A2714B5EB for ; Fri, 17 Oct 2014 10:01:23 +0200 (CEST) Received: from BN3PR0301CA0039.namprd03.prod.outlook.com (25.160.180.177) by CY1PR0301MB0699.namprd03.prod.outlook.com (25.160.159.141) with Microsoft SMTP Server (TLS) id 15.0.1049.19; Fri, 17 Oct 2014 08:01:21 +0000 Received: from BN1BFFO11FD016.protection.gbl (2a01:111:f400:7c10::1:172) by BN3PR0301CA0039.outlook.office365.com (2a01:111:e400:4000::49) with Microsoft SMTP Server (TLS) id 15.0.1054.13 via Frontend Transport; Fri, 17 Oct 2014 08:01:20 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD016.mail.protection.outlook.com (10.58.144.79) with Microsoft SMTP Server (TLS) id 15.0.1039.16 via Frontend Transport; Fri, 17 Oct 2014 08:01:19 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s9H81CJF023491; Fri, 17 Oct 2014 01:01:17 -0700 From: Alison Wang To: , Date: Fri, 17 Oct 2014 16:00:28 +0800 Message-ID: <1413532834-10380-3-git-send-email-b18965@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1413532834-10380-1-git-send-email-b18965@freescale.com> References: <1413532834-10380-1-git-send-email-b18965@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:CAL; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(54534003)(189002)(199003)(20776003)(68736004)(47776003)(102836001)(87286001)(46102003)(85852003)(84676001)(87936001)(50466002)(48376002)(21056001)(50986999)(89996001)(44976005)(26826002)(76176999)(31966008)(80022003)(19580395003)(88136002)(69596002)(19580405001)(93916002)(81156004)(95666004)(77156001)(105606002)(92566001)(107046002)(4396001)(64706001)(92726001)(120916001)(104166001)(62966002)(76482002)(97736003)(36756003)(229853001)(99396003)(106466001)(33646002)(85306004)(104016003)(6806004)(50226001)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB0699; H:az84smr01.freescale.net; FPR:; MLV:ovrnspm; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB0699; X-Forefront-PRVS: 0367A50BB1 Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=alison.wang@freescale.com; X-OriginatorOrg: freescale.com Cc: Alison Wang Subject: [U-Boot] [PATCH v3 2/8] spl: Use u-boot.img instead of u-boot.bin X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de In SD boot, the magic number of u-boot image will be checked. For LS102xA, u-boot.bin doesn't have the magic number. So use u-boot.img which includes the magic number instead of u-boot.bin when producing u-boot-with-spl-pbl.bin. Signed-off-by: Alison Wang --- Change log: v3: No change. v2: No change. Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 164929e..f22d767 100644 --- a/Makefile +++ b/Makefile @@ -969,10 +969,16 @@ MKIMAGEFLAGS_u-boot-spl.pbl = -n $(srctree)/$(CONFIG_SYS_FSL_PBL_RCW:"%"=%) \ spl/u-boot-spl.pbl: spl/u-boot-spl.bin FORCE $(call if_changed,mkimage) +ifeq ($(ARCH),arm) +UBOOT_BINLOAD := u-boot.img +else +UBOOT_BINLOAD := u-boot.bin +endif + OBJCOPYFLAGS_u-boot-with-spl-pbl.bin = -I binary -O binary --pad-to=$(CONFIG_SPL_PAD_TO) \ --gap-fill=0xff -u-boot-with-spl-pbl.bin: spl/u-boot-spl.pbl u-boot.bin FORCE +u-boot-with-spl-pbl.bin: spl/u-boot-spl.pbl $(UBOOT_BINLOAD) FORCE $(call if_changed,pad_cat) # PPC4xx needs the SPL at the end of the image, since the reset vector