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

[people/ms/u-boot.git] / lib_mips / Makefile

diff --git a/lib_mips/Makefile b/lib_mips/Makefile
index 799eaf2658ff9137f0dd0daf7bb22fbb3674353f..7967e5803a3be283c3093dd662a69a6e7e076d43 100644 (file)
--- a/lib_mips/Makefile
+++ b/lib_mips/Makefile
@@ -28,10 +28,14 @@ LIB = $(obj)lib$(ARCH).a
 SOBJS-y        +=
 
 COBJS-y        += board.o
+ifeq ($(CONFIG_QEMU_MIPS),y)
+COBJS-y        += bootm_qemu_mips.o
+else
 COBJS-y        += bootm.o
+endif
 COBJS-y        += time.o
 
-SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
 OBJS   := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
 
 $(LIB):        $(obj).depend $(OBJS)