diff mbox

[U-Boot] : davinci: Replace CONFIG_PRELOADER with CONFIG_SPL_BUILD in board/davinci/common/misc.c

Message ID 1315917728-4730-1-git-send-email-urwithsughosh@gmail.com
State Superseded
Headers show

Commit Message

Sughosh Ganu Sept. 13, 2011, 12:42 p.m. UTC
Make the conditional compilation in misc.c based on
CONFIG_SPL_BUILD, replacing CONFIG_PRELOADER which was removed as part
of commit 401bb30b6d.

Making this change, we no longer need to compile memsize.c for
hawkboard's nand_spl.

Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
---

Tested the changes on hawkboard.
Build tested on davinci boards with a 'MAKEALL -v davinci'


 board/davinci/common/misc.c              |    2 +-
 nand_spl/board/davinci/da8xxevm/Makefile |    6 ------
 2 files changed, 1 insertions(+), 7 deletions(-)

Comments

Stefano Babic Sept. 13, 2011, 12:45 p.m. UTC | #1
On 09/13/2011 02:42 PM, Sughosh Ganu wrote:
> Make the conditional compilation in misc.c based on
> CONFIG_SPL_BUILD, replacing CONFIG_PRELOADER which was removed as part
> of commit 401bb30b6d.
> 
> Making this change, we no longer need to compile memsize.c for
> hawkboard's nand_spl.
> 
> Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>

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

Best regards,
Stefano Babic
Heiko Schocher Sept. 14, 2011, 5:53 a.m. UTC | #2
Hello Ganu,

Sughosh Ganu wrote:
> Make the conditional compilation in misc.c based on
> CONFIG_SPL_BUILD, replacing CONFIG_PRELOADER which was removed as part
> of commit 401bb30b6d.
> 
> Making this change, we no longer need to compile memsize.c for
> hawkboard's nand_spl.
> 
> Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
> ---
> 
> Tested the changes on hawkboard.
> Build tested on davinci boards with a 'MAKEALL -v davinci'
> 
> 
>  board/davinci/common/misc.c              |    2 +-
>  nand_spl/board/davinci/da8xxevm/Makefile |    6 ------
>  2 files changed, 1 insertions(+), 7 deletions(-)

Hehe, have similiar patch in my queue, so:

Acked-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
Sughosh Ganu Sept. 19, 2011, 7:30 a.m. UTC | #3
On Tue Sep 13, 2011 at 06:12:08PM +0530, Sughosh Ganu wrote:
> Make the conditional compilation in misc.c based on
> CONFIG_SPL_BUILD, replacing CONFIG_PRELOADER which was removed as part
> of commit 401bb30b6d.
> 
> Making this change, we no longer need to compile memsize.c for
> hawkboard's nand_spl.
> 
> Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
> ---
> 
> Tested the changes on hawkboard.
> Build tested on davinci boards with a 'MAKEALL -v davinci'
> 
> 
>  board/davinci/common/misc.c              |    2 +-
>  nand_spl/board/davinci/da8xxevm/Makefile |    6 ------
>  2 files changed, 1 insertions(+), 7 deletions(-)

   Will this not go through ti next branch. I don't see this patch
   included in the u-boot-ti/next pull request by Sandeep.

-sughosh
Sughosh Ganu Oct. 31, 2011, 10:44 a.m. UTC | #4
On Mon Sep 19, 2011 at 01:00:25PM +0530, Sughosh Ganu wrote:
> On Tue Sep 13, 2011 at 06:12:08PM +0530, Sughosh Ganu wrote:
> > Make the conditional compilation in misc.c based on
> > CONFIG_SPL_BUILD, replacing CONFIG_PRELOADER which was removed as part
> > of commit 401bb30b6d.
> > 
> > Making this change, we no longer need to compile memsize.c for
> > hawkboard's nand_spl.
> > 
> > Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
> > ---
> > 
> > Tested the changes on hawkboard.
> > Build tested on davinci boards with a 'MAKEALL -v davinci'
> > 
> > 
> >  board/davinci/common/misc.c              |    2 +-
> >  nand_spl/board/davinci/da8xxevm/Makefile |    6 ------
> >  2 files changed, 1 insertions(+), 7 deletions(-)
> 
>    Will this not go through ti next branch. I don't see this patch
>    included in the u-boot-ti/next pull request by Sandeep.

   Sandeep, can this be included in the ti tree. This has been pending
   for some time now. Thanks.

-sughosh
Heiko Schocher Oct. 31, 2011, 11:20 a.m. UTC | #5
Hello Sughosh Ganu,

Sughosh Ganu wrote:
> On Mon Sep 19, 2011 at 01:00:25PM +0530, Sughosh Ganu wrote:
>> On Tue Sep 13, 2011 at 06:12:08PM +0530, Sughosh Ganu wrote:
>>> Make the conditional compilation in misc.c based on
>>> CONFIG_SPL_BUILD, replacing CONFIG_PRELOADER which was removed as part
>>> of commit 401bb30b6d.
>>>
>>> Making this change, we no longer need to compile memsize.c for
>>> hawkboard's nand_spl.
>>>
>>> Signed-off-by: Sughosh Ganu <urwithsughosh@gmail.com>
>>> ---
>>>
>>> Tested the changes on hawkboard.
>>> Build tested on davinci boards with a 'MAKEALL -v davinci'
>>>
>>>
>>>  board/davinci/common/misc.c              |    2 +-
>>>  nand_spl/board/davinci/da8xxevm/Makefile |    6 ------
>>>  2 files changed, 1 insertions(+), 7 deletions(-)
>>    Will this not go through ti next branch. I don't see this patch
>>    included in the u-boot-ti/next pull request by Sandeep.
> 
>    Sandeep, can this be included in the ti tree. This has been pending
>    for some time now. Thanks.

@Sandeep: if you apply this patch, can you please remove my patch

http://patchwork.ozlabs.org/patch/106983/

pending since 2011-07-27 from patchworks?

Thanks!

bye,
Heiko
diff mbox

Patch

diff --git a/board/davinci/common/misc.c b/board/davinci/common/misc.c
index 89ae111..5aa7605 100644
--- a/board/davinci/common/misc.c
+++ b/board/davinci/common/misc.c
@@ -33,7 +33,7 @@ 
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifndef CONFIG_PRELOADER
+#ifndef CONFIG_SPL_BUILD
 int dram_init(void)
 {
 	/* dram_init must store complete ramsize in gd->ram_size */
diff --git a/nand_spl/board/davinci/da8xxevm/Makefile b/nand_spl/board/davinci/da8xxevm/Makefile
index accf716..1df5c62 100644
--- a/nand_spl/board/davinci/da8xxevm/Makefile
+++ b/nand_spl/board/davinci/da8xxevm/Makefile
@@ -45,7 +45,6 @@  COBJS	= cpu.o \
 	davinci_pinmux.o \
 	div0.o \
 	hawkboard_nand_spl.o \
-	memsize.o \
 	misc.o \
 	nand_boot.o \
 	ns16550.o \
@@ -136,11 +135,6 @@  $(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 $@
-
 #########################################################################
 
 $(obj)%.o:	$(obj)%.S