[U-Boot] [PATCH] ARM: hawkboard: fix compilation of nand_spl
get_ram_size() is called, but memsize.c is not compiled.
Signed-off-by: Stefano Babic sbabic@denx.de --- nand_spl/board/davinci/da8xxevm/Makefile | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/nand_spl/board/davinci/da8xxevm/Makefile b/nand_spl/board/davinci/da8xxevm/Makefile index b3f4bd6..65ed055 100644 --- a/nand_spl/board/davinci/da8xxevm/Makefile +++ b/nand_spl/board/davinci/da8xxevm/Makefile @@ -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 $@
#########################################################################
Dear Stefano Babic,
In message 1315552622-27566-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
nand_spl/board/davinci/da8xxevm/Makefile | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/nand_spl/board/davinci/da8xxevm/Makefile b/nand_spl/board/davinci/da8xxevm/Makefile index b3f4bd6..65ed055 100644 --- a/nand_spl/board/davinci/da8xxevm/Makefile +++ b/nand_spl/board/davinci/da8xxevm/Makefile @@ -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.
+# 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
On 09/09/2011 09:36 AM, Wolfgang Denk wrote:
Dear Stefano Babic,
In message 1315552622-27566-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
nand_spl/board/davinci/da8xxevm/Makefile | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/nand_spl/board/davinci/da8xxevm/Makefile b/nand_spl/board/davinci/da8xxevm/Makefile index b3f4bd6..65ed055 100644 --- a/nand_spl/board/davinci/da8xxevm/Makefile +++ b/nand_spl/board/davinci/da8xxevm/Makefile @@ -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.
Ok.
+# 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
hi Stefano,
On Fri Sep 09, 2011 at 11:04:14AM +0200, Stefano Babic wrote:
On 09/09/2011 09:36 AM, Wolfgang Denk wrote:
<snip>
+# 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.
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
On 09/12/2011 01:05 PM, Sughosh Ganu wrote:
hi Stefano,
On Fri Sep 09, 2011 at 11:04:14AM +0200, Stefano Babic wrote:
On 09/09/2011 09:36 AM, Wolfgang Denk wrote:
<snip>
Hi Sughosh,
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.
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
get_ram_size() is called, but memsize.c is not compiled.
Signed-off-by: Stefano Babic sbabic@denx.de --- nand_spl/board/davinci/da8xxevm/Makefile | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/nand_spl/board/davinci/da8xxevm/Makefile b/nand_spl/board/davinci/da8xxevm/Makefile index b3f4bd6..65ed055 100644 --- a/nand_spl/board/davinci/da8xxevm/Makefile +++ b/nand_spl/board/davinci/da8xxevm/Makefile @@ -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 $@
#########################################################################
On 09/09/2011 11:23 AM, Stefano Babic wrote:
get_ram_size() is called, but memsize.c is not compiled.
Signed-off-by: Stefano Babic sbabic@denx.de
Sorry, forget it. I sent again V1 of the patch...
Best regards, Stefano Babic
get_ram_size() is called, but memsize.c is not compiled.
Signed-off-by: Stefano Babic sbabic@denx.de --- nand_spl/board/davinci/da8xxevm/Makefile | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-)
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 comon directory +$(obj)memsize.c: + @rm -f $@ + ln -s $(TOPDIR)/common/memsize.c $@
#########################################################################
Dear Stefano Babic,
In message 1315561023-7015-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
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
On 09/09/2011 01:40 PM, Wolfgang Denk wrote:
Dear Stefano Babic,
In message 1315561023-7015-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
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?
There is only one reason: I forget to do it !
ok, I will try again...
Best regards, Stefano Babic
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(-)
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 $@
#########################################################################
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
Le 10/09/2011 16:13, Wolfgang Denk a écrit :
Dear Stefano Babic,
In message1315573742-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 Babicsbabic@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,
get_ram_size() is called, but memsize.c is not compiled.
Signed-off-by: Stefano Babic sbabic@denx.de
nand_spl/board/davinci/da8xxevm/Makefile | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
Pushed to u-boot-ti
--Sandeep
participants (5)
-
Albert ARIBAUD -
Paulraj, Sandeep -
Stefano Babic -
Sughosh Ganu -
Wolfgang Denk