ARM: hawkboard: fix compilation of nand_spl

PATCH New Stefano Babic 5 participants 14 messages Sep 9, 2011 – Sep 12, 2011

lore

Share & tools

lore

Stefano Babic

author

2011-09-09 07:17 UTC #0 lore raw

PATCH 1/1 ARM: hawkboard: fix compilation of nand_spl

get_ram_size() is called, but memsize.c is not compiled.

Signed-off-by Stefano Babic <[email protected]>

---
 nand_spl/board/davinci/da8xxevm/Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

nand_spl/board/davinci/da8xxevm/Makefile +5 -1

index b3f4bd6..65ed055 100644
@@ -38,7 +38,7 @@ CFLAGS	+= -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
 
 SOBJS	= start.o _udivsi3.o _divsi3.o
 COBJS	= cpu.o davinci_nand.o ns16550.o div0.o davinci_pinmux.o psc.o	\
-	misc.o hawkboard_nand_spl.o nand_boot.o
+	misc.o hawkboard_nand_spl.o nand_boot.o memsize.o
 
 SRCS	:= $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))

@@ -125,6 +125,10 @@ $(obj)psc.c:
 	@rm -f $@
 	ln -s $(TOPDIR)/arch/arm/cpu/arm926ejs/davinci/psc.c $@
 
+# from comon directory
+$(obj)memsize.c:
+	@rm -f $@
+	ln -s $(TOPDIR)/common/memsize.c $@
 
 #########################################################################

Signature · 1 line

1.7.1

Wolfgang Denk

2011-09-09 07:36 UTC #1 lore raw

PATCH 1/1 ARM: hawkboard: fix compilation of nand_spl

Dear Stefano Babic,

Quoted 12 lines · In message <[email protected]> you wrote:

get_ram_size() is called, but memsize.c is not compiled.
Signed-off-by Stefano Babic <[email protected]>
---
 nand_spl/board/davinci/da8xxevm/Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
nand_spl/board/davinci/da8xxevm/Makefile +0 -0
index b3f4bd6..65ed055 100644

nand_spl/board/davinci/da8xxevm/Makefile CFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL · line 41

Quoted 5 lines

nand_spl/board/davinci/da8xxevm/Makefile +1 -1

@@ -38,7 +38,7 @@ CFLAGS	+= -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
 
 SOBJS	= start.o _udivsi3.o _divsi3.o
 COBJS	= cpu.o davinci_nand.o ns16550.o div0.o davinci_pinmux.o psc.o	\
-	misc.o hawkboard_nand_spl.o nand_boot.o
+	misc.o hawkboard_nand_spl.o nand_boot.o memsize.o

Please split these litst (one object name per line), and sort them.

nand_spl/board/davinci/da8xxevm/Makefile $(obj)psc.c: · line 131

Quoted 4 lines

nand_spl/board/davinci/da8xxevm/Makefile +4 -0
+# from comon directory
+$(obj)memsize.c:
+	@rm -f $@
+	ln -s $(TOPDIR)/common/memsize.c $@

Can we not rather compile the file in the common directory instead?

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The heart is not a logical organ.
	-- Dr. Janet Wallace, "The Deadly Years", stardate 3479.4

Stefano Babic

author

2011-09-09 09:04 UTC #2 lore raw

PATCH 1/1 ARM: hawkboard: fix compilation of nand_spl

Quoted 16 lines · Wolfgang Denk

Dear Stefano Babic,
Quoted 13 lines · In message <[email protected]> you wrote:
get_ram_size() is called, but memsize.c is not compiled.
Signed-off-by Stefano Babic <[email protected]>
---
 nand_spl/board/davinci/da8xxevm/Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
nand_spl/board/davinci/da8xxevm/Makefile +0 -0
index b3f4bd6..65ed055 100644
@@ -38,7 +38,7 @@ CFLAGS	+= -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
 

Quoted 6 lines

nand_spl/board/davinci/da8xxevm/Makefile CFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL · line 41
Quoted 4 lines
nand_spl/board/davinci/da8xxevm/Makefile +1 -1
 SOBJS	= start.o _udivsi3.o _divsi3.o
 COBJS	= cpu.o davinci_nand.o ns16550.o div0.o davinci_pinmux.o psc.o	\
-	misc.o hawkboard_nand_spl.o nand_boot.o
+	misc.o hawkboard_nand_spl.o nand_boot.o memsize.o
Please split these litst (one object name per line), and sort them.

Ok.

Quoted 7 lines

nand_spl/board/davinci/da8xxevm/Makefile $(obj)psc.c: · line 131
Quoted 5 lines
nand_spl/board/davinci/da8xxevm/Makefile +4 -0
+# from comon directory
+$(obj)memsize.c:
+	@rm -f $@
+	ln -s $(TOPDIR)/common/memsize.c $@
Can we not rather compile the file in the common directory instead?

This is only for nand_spl, not for u-boot. The nand_spl/board/Makefile has the list of files that must be compiled. Of course, the file was already compiled in common for u-boot.bin.

Not sure why this issue appears now. Rebuilding all ARM boards I see that hawkboard is broken, I have not bisect to check when it happened.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
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 at denx.de
=====================================================================

Sughosh Ganu

2011-09-12 11:05 UTC #3 lore raw

PATCH 1/1 ARM: hawkboard: fix compilation of nand_spl

hi Stefano,

Quoted 1 line · Stefano Babic

On 09/09/2011 09:36 AM, Wolfgang Denk wrote:

<snip>

Quoted 8 lines

Quoted 7 lines
nand_spl/board/davinci/da8xxevm/Makefile $(obj)psc.c: · line 131
Quoted 5 lines
nand_spl/board/davinci/da8xxevm/Makefile +4 -0
+# from comon directory
+$(obj)memsize.c:
+	@rm -f $@
+	ln -s $(TOPDIR)/common/memsize.c $@
Can we not rather compile the file in the common directory instead?

Quoted 6 lines

This is only for nand_spl, not for u-boot. The nand_spl/board/Makefile has the list of files that must be compiled. Of course, the file was already compiled in common for u-boot.bin.
Not sure why this issue appears now. Rebuilding all ARM boards I see that hawkboard is broken, I have not bisect to check when it happened.

Sorry for not having caught this earlier. I ran git bisect on this, and the commit "401bb30b6d replace CONFIG_PRELOADER with CONFIG_SPL_BUILD" seems to be causing the build break.

The issue seems to be that the code in board/davinci/common/misc.c gets conditionally compiled based on definition of CONFIG_PRELOADER symbol, which was removed in this commit, and replaced by CONFIG_SPL_BUILD. I think we should correspondingly change this check in misc.c, so that it would not be required to compile in memsize.c. Let me know, and i will test this change and send out a patch. Thanks.

-sughosh

Stefano Babic

author

2011-09-12 13:16 UTC #4 lore raw

PATCH 1/1 ARM: hawkboard: fix compilation of nand_spl

Quoted 6 lines · Sughosh Ganu

hi Stefano,
Quoted 1 line · Stefano Babic
On 09/09/2011 09:36 AM, Wolfgang Denk wrote:
<snip>

Hi Sughosh,

Quoted 9 lines

Sorry for not having caught this earlier. I ran git bisect on this, and the commit "401bb30b6d replace CONFIG_PRELOADER with CONFIG_SPL_BUILD" seems to be causing the build break.
The issue seems to be that the code in board/davinci/common/misc.c gets conditionally compiled based on definition of CONFIG_PRELOADER symbol, which was removed in this commit, and replaced by CONFIG_SPL_BUILD.

Yes, right.

Quoted 4 lines

I think we should correspondingly change this
check in misc.c, so that it would not be required to compile in memsize.c. Let me know, and i will test this change and send out a patch. Thanks.

Agree. This is the right solution.

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
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 at denx.de
=====================================================================

Stefano Babic

author

2011-09-09 09:23 UTC #5 lore raw

PATCH 1/1 ARM: hawkboard: fix compilation of nand_spl

In reply to Stefano Babic

get_ram_size() is called, but memsize.c is not compiled.

Signed-off-by Stefano Babic <[email protected]>

---
 nand_spl/board/davinci/da8xxevm/Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

nand_spl/board/davinci/da8xxevm/Makefile +5 -1

index b3f4bd6..65ed055 100644
@@ -38,7 +38,7 @@ CFLAGS	+= -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
 
 SOBJS	= start.o _udivsi3.o _divsi3.o
 COBJS	= cpu.o davinci_nand.o ns16550.o div0.o davinci_pinmux.o psc.o	\
-	misc.o hawkboard_nand_spl.o nand_boot.o
+	misc.o hawkboard_nand_spl.o nand_boot.o memsize.o
 
 SRCS	:= $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))

@@ -125,6 +125,10 @@ $(obj)psc.c:
 	@rm -f $@
 	ln -s $(TOPDIR)/arch/arm/cpu/arm926ejs/davinci/psc.c $@
 
+# from comon directory
+$(obj)memsize.c:
+	@rm -f $@
+	ln -s $(TOPDIR)/common/memsize.c $@
 
 #########################################################################

Signature · 1 line

1.7.1

Stefano Babic

author

2011-09-09 09:36 UTC #6 lore raw

PATCH 1/1 ARM: hawkboard: fix compilation of nand_spl

Quoted 4 lines · Stefano Babic

get_ram_size() is called, but memsize.c is not compiled.
Signed-off-by Stefano Babic <[email protected]>
---

Sorry, forget it. I sent again V1 of the patch...

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
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 at denx.de
=====================================================================

Stefano Babic

author

2011-09-09 09:37 UTC #7 lore raw

PATCH 1/1 ARM: hawkboard_nand: fix compilation of nand_spl

In reply to Stefano Babic

get_ram_size() is called, but memsize.c is not compiled.

Signed-off-by Stefano Babic <[email protected]>

---
 nand_spl/board/davinci/da8xxevm/Makefile |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

nand_spl/board/davinci/da8xxevm/Makefile +18 -3

index b3f4bd6..c82f6c6 100644
@@ -36,9 +36,20 @@ LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
 AFLAGS	+= -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
 CFLAGS	+= -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
 
-SOBJS	= start.o _udivsi3.o _divsi3.o
-COBJS	= cpu.o davinci_nand.o ns16550.o div0.o davinci_pinmux.o psc.o	\
-	misc.o hawkboard_nand_spl.o nand_boot.o
+SOBJS	= _divsi3.o \
+	_udivsi3.o \
+	start.o
+
+COBJS	= cpu.o \
+	davinci_nand.o \
+	davinci_pinmux.o \
+	div0.o \
+	hawkboard_nand_spl.o \
+	memsize.o \
+	misc.o \
+	nand_boot.o \
+	ns16550.o \
+	psc.o
 
 SRCS	:= $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))

@@ -125,6 +136,10 @@ $(obj)psc.c:
 	@rm -f $@
 	ln -s $(TOPDIR)/arch/arm/cpu/arm926ejs/davinci/psc.c $@
 
+# from comon directory
+$(obj)memsize.c:
+	@rm -f $@
+	ln -s $(TOPDIR)/common/memsize.c $@
 
 #########################################################################

Signature · 1 line

1.7.1

Wolfgang Denk

2011-09-09 11:40 UTC #8 lore raw

PATCH 1/1 ARM: hawkboard_nand: fix compilation of nand_spl

Dear Stefano Babic,

Quoted 6 lines · In message <[email protected]> you wrote:

get_ram_size() is called, but memsize.c is not compiled.
Signed-off-by Stefano Babic <[email protected]>
---
 nand_spl/board/davinci/da8xxevm/Makefile |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

So, what is this now? v1? v2? anything else?

And what exactly has been changed?

Why is there no version in the Subject, and no Changelog in the comment section?

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
A witty saying proves nothing, but saying  something  pointless  gets
people's attention.

Stefano Babic

author

2011-09-09 12:40 UTC #9 lore raw

PATCH 1/1 ARM: hawkboard_nand: fix compilation of nand_spl

Quoted 10 lines · Wolfgang Denk

Dear Stefano Babic,
Quoted 6 lines · In message <[email protected]> you wrote:
get_ram_size() is called, but memsize.c is not compiled.
Signed-off-by Stefano Babic <[email protected]>
---
 nand_spl/board/davinci/da8xxevm/Makefile |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

Quoted 6 lines

So, what is this now? v1? v2? anything else?
And what exactly has been changed?
Why is there no version in the Subject, and no Changelog in the comment section?

There is only one reason: I forget to do it !

ok, I will try again...

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
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 at denx.de
=====================================================================

Stefano Babic

author

2011-09-09 13:09 UTC #10 lore raw

PATCH v2 1/1 ARM: hawkboard_nand: fix compilation of nand_spl

In reply to Stefano Babic

get_ram_size() is called, but memsize.c is not compiled.

Signed-off-by Stefano Babic <[email protected]>

---

Changes since V1:
- make list sorted (Wolfgang Denk)

 nand_spl/board/davinci/da8xxevm/Makefile |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

nand_spl/board/davinci/da8xxevm/Makefile +18 -3

index b3f4bd6..c82f6c6 100644
@@ -36,9 +36,20 @@ LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
 AFLAGS	+= -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
 CFLAGS	+= -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
 
-SOBJS	= start.o _udivsi3.o _divsi3.o
-COBJS	= cpu.o davinci_nand.o ns16550.o div0.o davinci_pinmux.o psc.o	\
-	misc.o hawkboard_nand_spl.o nand_boot.o
+SOBJS	= _divsi3.o \
+	_udivsi3.o \
+	start.o
+
+COBJS	= cpu.o \
+	davinci_nand.o \
+	davinci_pinmux.o \
+	div0.o \
+	hawkboard_nand_spl.o \
+	memsize.o \
+	misc.o \
+	nand_boot.o \
+	ns16550.o \
+	psc.o
 
 SRCS	:= $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))

@@ -125,6 +136,10 @@ $(obj)psc.c:
 	@rm -f $@
 	ln -s $(TOPDIR)/arch/arm/cpu/arm926ejs/davinci/psc.c $@
 
+# from common directory
+$(obj)memsize.c:
+	@rm -f $@
+	ln -s $(TOPDIR)/common/memsize.c $@
 
 #########################################################################

Signature · 1 line

1.7.1

Wolfgang Denk

Applied

2011-09-10 14:13 UTC #11 lore raw

PATCH v2 1/1 ARM: hawkboard_nand: fix compilation of nand_spl

Dear Stefano Babic,

Quoted 10 lines · In message <[email protected]> you wrote:

get_ram_size() is called, but memsize.c is not compiled.
Signed-off-by Stefano Babic <[email protected]>
---
Changes since V1:
- make list sorted (Wolfgang Denk)
 nand_spl/board/davinci/da8xxevm/Makefile |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 7 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Nearly everyone is in favor of going  to  heaven  but  too  many  are
hoping  they'll  live  long  enough  to see an easing of the entrance
requirements. Never appeal to a man's "better nature." he  might  not
have one.

Albert ARIBAUD

2011-09-11 16:19 UTC #12 lore raw

PATCH v2 1/1 ARM: hawkboard_nand: fix compilation of nand_spl

Le 10/09/2011 16:13, Wolfgang Denk a ?crit :

Quoted 8 lines

Dear Stefano Babic,
Quoted 5 lines · In message<[email protected]> you wrote:
get_ram_size() is called, but memsize.c is not compiled.
Signed-off-by Stefano Babic<[email protected]>
---

Quoted 7 lines

Quoted 5 lines
Changes since V1:
- make list sorted (Wolfgang Denk)
  nand_spl/board/davinci/da8xxevm/Makefile |   21 ++++++++++++++++++---
  1 files changed, 18 insertions(+), 3 deletions(-)
Applied, thanks.

Note:

This patch was also pushed to the u-boot-ti tree by Sandeep, then pulled in mine, but it was V1. I'm rebasing u-boot-arm onto u-boot and picking your version as it is V2.

Quoted 3 lines

Best regards,
Wolfgang Denk

Amicalement,

Signature · 1 line

Albert.

Paulraj

2011-09-09 20:34 UTC #13 lore raw

PATCH 1/1 ARM: hawkboard: fix compilation of nand_spl

In reply to Stefano Babic

Quoted 8 lines

get_ram_size() is called, but memsize.c is not compiled.
Signed-off-by Stefano Babic <[email protected]>
---
 nand_spl/board/davinci/da8xxevm/Makefile |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

Pushed to u-boot-ti

--Sandeep