From patchwork Wed Jan 26 21:07:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haiying Wang X-Patchwork-Id: 80551 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 EFE3FB7113 for ; Thu, 27 Jan 2011 08:07:53 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7363228093; Wed, 26 Jan 2011 22:07:51 +0100 (CET) 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 xi7L7VTbvUte; Wed, 26 Jan 2011 22:07:51 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 67D5F2808B; Wed, 26 Jan 2011 22:07:48 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1FE462808B for ; Wed, 26 Jan 2011 22:07:46 +0100 (CET) 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 PLpwN1JONhpA for ; Wed, 26 Jan 2011 22:07:44 +0100 (CET) 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 ch1outboundpool.messaging.microsoft.com (ch1outboundpool.messaging.microsoft.com [157.55.116.160]) by theia.denx.de (Postfix) with ESMTPS id 266152808A for ; Wed, 26 Jan 2011 22:07:41 +0100 (CET) Received: from mail4-ch1-R.bigfish.com (216.32.181.168) by CH1EHSOBE005.bigfish.com (10.43.70.55) with Microsoft SMTP Server id 14.1.225.8; Wed, 26 Jan 2011 21:07:39 +0000 Received: from mail4-ch1 (localhost.localdomain [127.0.0.1]) by mail4-ch1-R.bigfish.com (Postfix) with ESMTP id 8238BFE00D4; Wed, 26 Jan 2011 21:07:39 +0000 (UTC) X-SpamScore: -17 X-BigFish: VS-17(zz936eK1432N98dN168aJzz1202hzz8275bhz2dh2a8h668h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:de01egw02.freescale.net; RD:de01egw02.freescale.net; EFVD:NLI Received: from mail4-ch1 (localhost.localdomain [127.0.0.1]) by mail4-ch1 (MessageSwitch) id 12960760599445_21067; Wed, 26 Jan 2011 21:07:39 +0000 (UTC) Received: from CH1EHSMHS024.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.253]) by mail4-ch1.bigfish.com (Postfix) with ESMTP id E8298CB804F; Wed, 26 Jan 2011 21:07:38 +0000 (UTC) Received: from de01egw02.freescale.net (192.88.165.103) by CH1EHSMHS024.bigfish.com (10.43.70.24) with Microsoft SMTP Server (TLS) id 14.1.225.8; Wed, 26 Jan 2011 21:07:38 +0000 Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by de01egw02.freescale.net (8.14.3/8.14.3) with ESMTP id p0QL7b0p018640; Wed, 26 Jan 2011 14:07:37 -0700 (MST) Received: from [10.29.200.208] (haiying-laptop.am.freescale.net [10.29.200.208]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id p0QL7ZDA024801; Wed, 26 Jan 2011 15:07:36 -0600 (CST) From: Haiying Wang To: Wolfgang Denk In-Reply-To: <20110124222945.9E445B187@gemini.denx.de> References: <1291217737-3870-1-git-send-email-Haiying.Wang@freescale.com> <1291217737-3870-4-git-send-email-Haiying.Wang@freescale.com> <20110122220438.DB85EB187@gemini.denx.de> <1295842861.2196.38.camel@haiying-laptop> <20110124124919.E02EFB187@gemini.denx.de> <1295906076.2051.127.camel@haiying-laptop> <20110124220925.CD3B6CD1385@gemini.denx.de> <1295907459.2051.158.camel@haiying-laptop> <20110124222945.9E445B187@gemini.denx.de> Date: Wed, 26 Jan 2011 16:07:36 -0500 Message-ID: <1296076056.1985.47.camel@haiying-laptop> MIME-Version: 1.0 X-Mailer: Evolution 2.30.3 X-OriginatorOrg: freescale.com Cc: u-boot@lists.denx.de Subject: Re: [U-Boot] [PATCH 3/8 v2] Introduce the Tertiary Program loader X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 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 Dear Wolfgang, On Mon, 2011-01-24 at 23:29 +0100, Wolfgang Denk wrote: > Dear Haiying Wang, > > In message <1295907459.2051.158.camel@haiying-laptop> you wrote: > > > > > It's not the name. But you use it ina few places here, buth then hard > > > encode "tpl" in a number of other paces there. Which means that you > > > cannot change TPL_BOOT to any other value, or building would break. > > > So why do we need this variable? > > It follows the same usage of NAND_SPL. > > Ah. I see. Well, so NAND_SPL needs fixing as well :-( I fixed the NAND_SPL in this way. If it is OK for you, I will generate the patches accordingly for TPL as well. Thanks. BTW, the "./MAKEALL powerpc " worked for my previous patch. Haiying From: Haiying Wang Date: Wed, 26 Jan 2011 16:03:39 -0500 Subject: [PATCH] Fix NAND_SPL in Makefile Signed-off-by: Haiying Wang --- Makefile | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 5f93646..f2c6d65 100644 --- a/Makefile +++ b/Makefile @@ -287,11 +287,6 @@ LDPPFLAGS += \ $(shell $(LD) --version | \ sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p') -ifeq ($(CONFIG_NAND_U_BOOT),y) -NAND_SPL = nand_spl -U_BOOT_NAND = $(obj)u-boot-nand.bin -endif - ifeq ($(CONFIG_ONENAND_U_BOOT),y) ONENAND_IPL = onenand_ipl U_BOOT_ONENAND = $(obj)u-boot-onenand.bin @@ -320,7 +315,11 @@ BOARD_SIZE_CHECK = endif # Always append ALL so that arch config.mk's can add custom ones -ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND) $(U_BOOT_ONENAND) +ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_ONENAND) + +ifeq ($(CONFIG_NAND_U_BOOT),y) +ALL += $(obj)u-boot-nand.bin +endif all: $(ALL) @@ -401,10 +400,11 @@ $(LDSCRIPT): depend $(obj)u-boot.lds: $(LDSCRIPT) $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@ -$(NAND_SPL): $(TIMESTAMP_FILE) $(VERSION_FILE) depend +$(obj)nand_spl: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk $(MAKE) -C nand_spl/board/$(BOARDDIR) all -$(U_BOOT_NAND): $(NAND_SPL) $(obj)u-boot.bin + +$(obj)u-boot-nand.bin: $(obj)nand_spl $(obj)u-boot.bin cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin $(ONENAND_IPL): $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk