From mboxrd@z Thu Jan 1 00:00:00 1970 From: Haiying Wang Date: Wed, 26 Jan 2011 16:07:36 -0500 Subject: [U-Boot] [PATCH 3/8 v2] Introduce the Tertiary Program loader 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> Message-ID: <1296076056.1985.47.camel@haiying-laptop> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@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 -- 1.7.3.1.50.g1e633