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

[J-u-boot.git] / board / freescale / mpc8610hpcd / Makefile

diff --git a/board/freescale/mpc8610hpcd/Makefile b/board/freescale/mpc8610hpcd/Makefile
index a457c32e861a87cf2111450401f4cdb09a439333..847edaf920f297df2d9e1becd3c481fa39755f6a 100644 (file)
--- a/board/freescale/mpc8610hpcd/Makefile
+++ b/board/freescale/mpc8610hpcd/Makefile
@@ -23,14 +23,14 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  := $(BOARD).o law.o
+COBJS-y        += $(BOARD).o
+COBJS-$(CONFIG_FSL_DDR2) += ddr.o
+COBJS-y        += law.o
 
-COBJS-${CONFIG_FSL_DIU_FB}     += mpc8610hpcd_diu.o
+COBJS-$(CONFIG_FSL_DIU_FB)     += mpc8610hpcd_diu.o
 
-COBJS  += ${COBJS-y}
-
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS))
+SRCS   := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS-y))
 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(obj).depend $(OBJS) $(SOBJS)