Patchwork [U-Boot] Fix NAND booting make target

login
register
mail settings
Submitter Stefan Roese
Date Nov. 23, 2010, 1:32 p.m.
Message ID <1290519140-6528-1-git-send-email-sr@denx.de>
Download mbox | patch
Permalink /patch/72654/
State Changes Requested
Headers show

Comments

Stefan Roese - Nov. 23, 2010, 1:32 p.m.
Without this fix, the NAND_SPL target (in nand_spl/) is not built
at all.

Signed-off-by: Stefan Roese <sr@denx.de>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Scott Wood - Nov. 23, 2010, 5:27 p.m.
On Tue, 23 Nov 2010 14:32:20 +0100
Stefan Roese <sr@denx.de> wrote:

> Without this fix, the NAND_SPL target (in nand_spl/) is not built
> at all.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>

It builds for me without it, on mpc8315erdb (I tried some 4xx boards
but they don't build at all), as of current master branch
(fa722ea76be565de6823ca04c107cc4fbd96b776).  Applying this change stops
it from building.

-Scott
Stefan Roese - Nov. 23, 2010, 6:16 p.m.
Hi Scott,

On Tuesday 23 November 2010 18:27:08 Scott Wood wrote:
> > Without this fix, the NAND_SPL target (in nand_spl/) is not built
> > at all.
> > 
> > Signed-off-by: Stefan Roese <sr@denx.de>
> 
> It builds for me without it, on mpc8315erdb (I tried some 4xx boards
> but they don't build at all), as of current master branch
> (fa722ea76be565de6823ca04c107cc4fbd96b776).  Applying this change stops
> it from building.

Yes, current git head fails to build an many 4xx boards. My patch is on top of 
Wolfgangs patchset "[PATCH 0/7] Address partial linking issues" from 
2010-11-21 which fixes most of the 4xx problems. But without this patch, no 
object was built in the nand_spl directory at all. Not sure if I overlooked 
something though.

Cheers,
Stefan

--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office@denx.de
Scott Wood - Nov. 23, 2010, 6:45 p.m.
On Tue, 23 Nov 2010 19:16:47 +0100
Stefan Roese <sr@denx.de> wrote:

> Hi Scott,
> 
> On Tuesday 23 November 2010 18:27:08 Scott Wood wrote:
> > > Without this fix, the NAND_SPL target (in nand_spl/) is not built
> > > at all.
> > > 
> > > Signed-off-by: Stefan Roese <sr@denx.de>
> > 
> > It builds for me without it, on mpc8315erdb (I tried some 4xx boards
> > but they don't build at all), as of current master branch
> > (fa722ea76be565de6823ca04c107cc4fbd96b776).  Applying this change stops
> > it from building.
> 
> Yes, current git head fails to build an many 4xx boards. My patch is on top of 
> Wolfgangs patchset "[PATCH 0/7] Address partial linking issues" from 
> 2010-11-21 which fixes most of the 4xx problems. But without this patch, no 
> object was built in the nand_spl directory at all. Not sure if I overlooked 
> something though.

Perhaps it has to do with the 4xx boards having NAND_U_BOOT directly in
boards.cfg, while the Freescale boards typically have NAND there, and
define NAND_U_BOOT in the makefile.

I think the proper fix is to figure out how those quotes are being
injected into the make variable.

-Scott
Scott Wood - Nov. 23, 2010, 6:51 p.m.
On Tue, 23 Nov 2010 12:45:04 -0600
Scott Wood <scottwood@freescale.com> wrote:

> On Tue, 23 Nov 2010 19:16:47 +0100
> Stefan Roese <sr@denx.de> wrote:
> 
> > Hi Scott,
> > 
> > On Tuesday 23 November 2010 18:27:08 Scott Wood wrote:
> > > > Without this fix, the NAND_SPL target (in nand_spl/) is not built
> > > > at all.
> > > > 
> > > > Signed-off-by: Stefan Roese <sr@denx.de>
> > > 
> > > It builds for me without it, on mpc8315erdb (I tried some 4xx boards
> > > but they don't build at all), as of current master branch
> > > (fa722ea76be565de6823ca04c107cc4fbd96b776).  Applying this change stops
> > > it from building.
> > 
> > Yes, current git head fails to build an many 4xx boards. My patch is on top of 
> > Wolfgangs patchset "[PATCH 0/7] Address partial linking issues" from 
> > 2010-11-21 which fixes most of the 4xx problems. But without this patch, no 
> > object was built in the nand_spl directory at all. Not sure if I overlooked 
> > something though.
> 
> Perhaps it has to do with the 4xx boards having NAND_U_BOOT directly in
> boards.cfg, while the Freescale boards typically have NAND there, and
> define NAND_U_BOOT in the makefile.
> 
> I think the proper fix is to figure out how those quotes are being
> injected into the make variable.

Try removing the "=y" in boards.cfg.  tools/scripts/define2mk.sed will
add quotes to things that aren't numbers, but it has special handling
to turn empty defines (or the number 1) into an unquoted y.

-Scott
Stefan Roese - Nov. 23, 2010, 7:28 p.m.
On Tuesday 23 November 2010 19:51:14 Scott Wood wrote:
> > > Yes, current git head fails to build an many 4xx boards. My patch is on
> > > top of Wolfgangs patchset "[PATCH 0/7] Address partial linking issues"
> > > from 2010-11-21 which fixes most of the 4xx problems. But without this
> > > patch, no object was built in the nand_spl directory at all. Not sure
> > > if I overlooked something though.
> > 
> > Perhaps it has to do with the 4xx boards having NAND_U_BOOT directly in
> > boards.cfg, while the Freescale boards typically have NAND there, and
> > define NAND_U_BOOT in the makefile.
> > 
> > I think the proper fix is to figure out how those quotes are being
> > injected into the make variable.
> 
> Try removing the "=y" in boards.cfg.  tools/scripts/define2mk.sed will
> add quotes to things that aren't numbers, but it has special handling
> to turn empty defines (or the number 1) into an unquoted y.

Yes, this works as well. I'll send an updated patch tomorrow.

Thanks.
 
Cheers,
Stefan

--
DENX Software Engineering GmbH,      MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich,  Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office@denx.de

Patch

diff --git a/Makefile b/Makefile
index b4aae89..e9797d6 100644
--- a/Makefile
+++ b/Makefile
@@ -287,7 +287,7 @@  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)
+ifeq ($(CONFIG_NAND_U_BOOT),"y")
 NAND_SPL = nand_spl
 U_BOOT_NAND = $(obj)u-boot-nand.bin
 endif