Merge branch 'master' of git://git.denx.de/u-boot-arm

[platform/kernel/u-boot.git] / board / samsung / smdkv310 / Makefile

diff --git a/board/samsung/smdkv310/Makefile b/board/samsung/smdkv310/Makefile
index 8e9b703..c4cd0a3 100644 (file)
--- a/board/samsung/smdkv310/Makefile
+++ b/board/samsung/smdkv310/Makefile
@@ -24,17 +24,28 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).o
 
-SOBJS  := mem_setup.o
-SOBJS  += lowlevel_init.o
+ifndef CONFIG_SPL_BUILD
 COBJS  += smdkv310.o
+endif
 
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS) $(SOBJS))
+SRCS   := $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
 
-all:    $(obj).depend $(LIB)
+ALL    :=       $(obj).depend $(LIB)
+
+ifdef CONFIG_SPL_BUILD
+ALL    += $(OBJTREE)/tools/mk$(BOARD)spl
+endif
+
+all:   $(ALL)
 
 $(LIB):        $(OBJS)
-       $(AR) $(ARFLAGS) $@ $(OBJS)
+       $(call cmd_link_o_target, $(OBJS))
+
+ifdef CONFIG_SPL_BUILD
+$(OBJTREE)/tools/mk$(BOARD)spl:        tools/mkv310_image.c
+       $(HOSTCC) tools/mkv310_image.c -o $(OBJTREE)/tools/mk$(BOARD)spl
+endif
 
 #########################################################################