summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorDavid Brownell <david-b@pacbell.net>2009-04-14 08:52:58 -0700
committerWolfgang Denk <wd@denx.de>2009-06-12 20:39:47 +0200
commit84f7411cb901b8df2391cf7e967ad0737f6194aa (patch)
tree4abd858b7a2f4958afb9dc44a836dc42bee6fe6c /cpu
parent641e0925e4bf7adf8e2e04e3ad81b840fd71cadd (diff)
downloadu-boot-imx-84f7411cb901b8df2391cf7e967ad0737f6194aa.zip
u-boot-imx-84f7411cb901b8df2391cf7e967ad0737f6194aa.tar.gz
u-boot-imx-84f7411cb901b8df2391cf7e967ad0737f6194aa.tar.bz2
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>
Diffstat (limited to 'cpu')
-rw-r--r--cpu/arm926ejs/davinci/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/cpu/arm926ejs/davinci/Makefile b/cpu/arm926ejs/davinci/Makefile
index ed24e65..7f51d17 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))