Patchwork [U-Boot,V2] ARM: hawkboard_nand: fix compilation of nand_spl

login
register
mail settings
Submitter Stefano Babic
Date Sept. 9, 2011, 1:09 p.m.
Message ID <1315573742-10128-1-git-send-email-sbabic@denx.de>
Download mbox | patch
Permalink /patch/114097/
State Accepted
Commit 5fb5e8c5e75f9e4ee26ee0ecbf67854b63964bc1
Headers show

Comments

Stefano Babic - Sept. 9, 2011, 1:09 p.m.
get_ram_size() is called, but memsize.c is not compiled.

Signed-off-by: Stefano Babic <sbabic@denx.de>
---

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

 nand_spl/board/davinci/da8xxevm/Makefile |   21 ++++++++++++++++++---
 1 files changed, 18 insertions(+), 3 deletions(-)
Wolfgang Denk - Sept. 10, 2011, 2:13 p.m.
Dear Stefano Babic,

In message <1315573742-10128-1-git-send-email-sbabic@denx.de> you wrote:
> get_ram_size() is called, but memsize.c is not compiled.
> 
> Signed-off-by: Stefano Babic <sbabic@denx.de>
> ---
> 
> 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
Albert ARIBAUD - Sept. 11, 2011, 4:19 p.m.
Le 10/09/2011 16:13, Wolfgang Denk a écrit :
> Dear Stefano Babic,
>
> In message<1315573742-10128-1-git-send-email-sbabic@denx.de>  you wrote:
>> get_ram_size() is called, but memsize.c is not compiled.
>>
>> Signed-off-by: Stefano Babic<sbabic@denx.de>
>> ---
>>
>> 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.

> Best regards,
>
> Wolfgang Denk

Amicalement,

Patch

diff --git a/nand_spl/board/davinci/da8xxevm/Makefile b/nand_spl/board/davinci/da8xxevm/Makefile
index b3f4bd6..c82f6c6 100644
--- a/nand_spl/board/davinci/da8xxevm/Makefile
+++ b/nand_spl/board/davinci/da8xxevm/Makefile
@@ -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 $@
 
 #########################################################################