Merge branch 'u-boot/master' into 'u-boot-arm/master'

[oweals/u-boot.git] / board / freescale / mx53loco / Makefile

diff --git a/board/freescale/mx53loco/Makefile b/board/freescale/mx53loco/Makefile
index 2088a4873658d966290e038b921e337a22d88694..3be17c5917c37c12dea9afe2496ccf95681afae1 100644 (file)
--- a/board/freescale/mx53loco/Makefile
+++ b/board/freescale/mx53loco/Makefile
@@ -22,20 +22,15 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).o
 
-COBJS  := mx53loco.o
+COBJS-y                        += mx53loco.o
+COBJS-$(CONFIG_VIDEO)  += mx53loco_video.o
 
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
+COBJS  := $(COBJS-y)
+SRCS   := $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
-SOBJS  := $(addprefix $(obj),$(SOBJS))
 
-$(LIB):        $(obj).depend $(OBJS) $(SOBJS)
-       $(call cmd_link_o_target, $(OBJS) $(SOBJS))
-
-clean:
-       rm -f $(SOBJS) $(OBJS)
-
-distclean:     clean
-       rm -f $(LIB) core *.bak .depend
+$(LIB):        $(obj).depend $(OBJS)
+       $(call cmd_link_o_target, $(OBJS))
 
 #########################################################################