From: David Brownell <david-b@pacbell.net>
Date: Tue, 14 Apr 2009 15:52:58 +0000 (-0700)
Subject: DaVinci now respects SKIP_LOWLEVEL_INIT
X-Git-Tag: v2009.08-rc1~153^2~125
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=84f7411cb901b8df2391cf7e967ad0737f6194aa;p=oweals%2Fu-boot.git

DaVinci now respects SKIP_LOWLEVEL_INIT

Don't needlessly include lowlevel init code; that's only really
needed with boot-from NOR (not boot-from-NAND).  The 2nd stage
loader (UBL) handles that before it loads U-Boot.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---

diff --git a/cpu/arm926ejs/davinci/Makefile b/cpu/arm926ejs/davinci/Makefile
index ed24e6569f..7f51d17775 100644
--- a/cpu/arm926ejs/davinci/Makefile
+++ b/cpu/arm926ejs/davinci/Makefile
@@ -28,7 +28,11 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)lib$(SOC).a
 
 COBJS	= timer.o ether.o lxt972.o dp83848.o
-SOBJS	= lowlevel_init.o reset.o
+SOBJS	= reset.o
+
+ifndef CONFIG_SKIP_LOWLEVEL_INIT
+SOBJS	+= lowlevel_init.o
+endif
 
 SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS))