: davinci: Replace CONFIG_PRELOADER with CONFIG_SPL_BUILD in board/davinci/common/misc.c

PATCH New Sughosh Ganu 3 participants 7 messages Sep 13, 2011 – Dec 6, 2011

Share & tools

Sughosh Ganu

author

2011-09-13 12:42 UTC #0 lore raw

PATCH 1/1 : davinci: Replace CONFIG_PRELOADER with CONFIG_SPL_BUILD in board/davinci/common/misc.c

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 <[email protected]>

---

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(-)

board/davinci/common/misc.c +1 -1

index 89ae111..5aa7605 100644
@@ -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 */

nand_spl/board/davinci/da8xxevm/Makefile +0 -6

index accf716..1df5c62 100644
@@ -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

Signature · 1 line

1.7.4.1

Stefano Babic

2011-09-13 12:45 UTC #1 lore raw

PATCH 1/1 : davinci: Replace CONFIG_PRELOADER with CONFIG_SPL_BUILD in board/davinci/common/misc.c

Quoted 8 lines · Sughosh Ganu

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 <[email protected]>

Acked-by Stefano Babic <[email protected]>

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
=====================================================================

Heiko Schocher

2011-09-14 05:53 UTC #2 lore raw

PATCH 1/1 : davinci: Replace CONFIG_PRELOADER with CONFIG_SPL_BUILD in board/davinci/common/misc.c

In reply to Sughosh Ganu

Hello Ganu,

Quoted 10 lines · Sughosh Ganu

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 <[email protected]>
---

Quoted 7 lines

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 <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Sughosh Ganu

author

2011-09-19 07:30 UTC #3 lore raw

PATCH 1/1 : davinci: Replace CONFIG_PRELOADER with CONFIG_SPL_BUILD in board/davinci/common/misc.c

In reply to Sughosh Ganu

Quoted 10 lines · Sughosh Ganu

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 <[email protected]>
---

Quoted 7 lines

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

author

2011-10-31 10:44 UTC #4 lore raw

PATCH 1/1 : davinci: Replace CONFIG_PRELOADER with CONFIG_SPL_BUILD in board/davinci/common/misc.c

Quoted 15 lines · Sughosh Ganu

Quoted 14 lines · Sughosh Ganu
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 <[email protected]>
---
Tested the changes on hawkboard.
Build tested on davinci boards with a 'MAKEALL -v davinci'

Quoted 6 lines

Quoted 3 lines
 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

2011-10-31 11:20 UTC #5 lore raw

PATCH 1/1 : davinci: Replace CONFIG_PRELOADER with CONFIG_SPL_BUILD in board/davinci/common/misc.c

Hello Sughosh Ganu,

Quoted 16 lines · Sughosh Ganu

Quoted 15 lines · Sughosh Ganu
Quoted 14 lines · Sughosh Ganu
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 <[email protected]>
---
Tested the changes on hawkboard.
Build tested on davinci boards with a 'MAKEALL -v davinci'

Quoted 8 lines

Quoted 5 lines
Quoted 3 lines
 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

Signature · 2 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Sughosh Ganu

author

2011-12-06 13:45 UTC #6 lore raw

PATCH v2 1/1 davinci: Remove unwanted memsize.c from hawkboard's nand spl build

In reply to Sughosh Ganu

dram_init function in board/davinci/common/misc.c does not get compiled for spl builds, thus rendering inclusion of memsize.c useless.

Signed-off-by Sughosh Ganu <[email protected]>

---

Changes since V1:
Rebased to current master branch

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

nand_spl/board/davinci/da8xxevm/Makefile +0 -6

index accf716..1df5c62 100644
@@ -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

Signature · 1 line

1.7.5.4