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

Sughosh Ganu urwithsughosh at gmail.com
Tue Sep 13 14:42:08 CEST 2011


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

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



More information about the U-Boot mailing list