From patchwork Fri Sep 26 10:33:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alison Wang X-Patchwork-Id: 393656 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 00BF214009E for ; Fri, 26 Sep 2014 20:34:59 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AE87BA73EB; Fri, 26 Sep 2014 12:34:58 +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 nXejqg+GyEeT; Fri, 26 Sep 2014 12:34:58 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 449934A053; Fri, 26 Sep 2014 12:34:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8F8D84A050 for ; Fri, 26 Sep 2014 12:34:41 +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 adZfwMoN887V for ; Fri, 26 Sep 2014 12:34:39 +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-by2-obe.outbound.protection.outlook.com (mail-by2on0101.outbound.protection.outlook.com [207.46.100.101]) by theia.denx.de (Postfix) with ESMTPS id 056374A033 for ; Fri, 26 Sep 2014 12:34:24 +0200 (CEST) Received: from DM2PR03CA0049.namprd03.prod.outlook.com (10.141.96.48) by DM2PR03MB382.namprd03.prod.outlook.com (10.141.55.14) with Microsoft SMTP Server (TLS) id 15.0.1039.15; Fri, 26 Sep 2014 10:34:16 +0000 Received: from BL2FFO11FD060.protection.gbl (2a01:111:f400:7c09::195) by DM2PR03CA0049.outlook.office365.com (2a01:111:e400:2428::48) with Microsoft SMTP Server (TLS) id 15.0.1024.12 via Frontend Transport; Fri, 26 Sep 2014 10:34:16 +0000 Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11FD060.mail.protection.outlook.com (10.173.161.188) with Microsoft SMTP Server (TLS) id 15.0.1029.15 via Frontend Transport; Fri, 26 Sep 2014 10:34:16 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id s8QAY7Lr009200; Fri, 26 Sep 2014 03:34:13 -0700 From: Alison Wang To: , , , Date: Fri, 26 Sep 2014 18:33:37 +0800 Message-ID: <1411727622-26557-3-git-send-email-b18965@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1411727622-26557-1-git-send-email-b18965@freescale.com> References: <1411727622-26557-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)(189002)(54534003)(199003)(97736003)(21056001)(87286001)(93916002)(74502003)(120916001)(46102003)(31966008)(10300001)(90102001)(77982003)(102836001)(62966002)(50466002)(85306004)(77156001)(81542003)(81156004)(36756003)(99396003)(79102003)(92566001)(4396001)(74662003)(2201001)(105606002)(81342003)(80022003)(92726001)(106466001)(48376002)(76482002)(50226001)(95666004)(87936001)(69596002)(83072002)(85852003)(6806004)(33646002)(47776003)(64706001)(20776003)(104016003)(88136002)(84676001)(89996001)(104166001)(19580405001)(107886001)(76176999)(83322001)(68736004)(50986999)(19580395003)(229853001)(107046002)(44976005)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR03MB382; H:az84smr01.freescale.net; FPR:; MLV:sfv; 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:DM2PR03MB382; X-Forefront-PRVS: 03468CBA43 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 Subject: [U-Boot] [PATCH v2 2/7] spl: Use u-boot.img instead of u-boot.bin 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: , 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: v2: No change. Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0ba106c..a3ea143 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