Merge branch 'master_merge_new-image' of /home/tur/git/u-boot

[u-boot] / lib_nios / Makefile

diff --git a/lib_nios/Makefile b/lib_nios/Makefile
index 7c9d62cf7c9ca5be9408259e985456cb36591253..c41d981a3e6d4a7dba58d6ff372ac6fec511bb71 100644 (file)
--- a/lib_nios/Makefile
+++ b/lib_nios/Makefile
@@ -25,12 +25,17 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(ARCH).a
 
-SOBJS  =
+SOBJS-y        +=
 
-COBJS  = board.o cache.o divmod.o nios_linux.o mult.o time.o
+COBJS-y        += board.o
+COBJS-y        += bootm.o
+COBJS-y        += cache.o
+COBJS-y        += divmod.o
+COBJS-y        += mult.o
+COBJS-y        += time.o
 
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
+SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS   := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
 
 $(LIB):        $(obj).depend $(OBJS)
        $(AR) $(ARFLAGS) $@ $(OBJS)