Merge branch 'master' of /home/wd/git/u-boot/custodians

[oweals/u-boot.git] / board / socrates / Makefile

diff --git a/board/socrates/Makefile b/board/socrates/Makefile
index a41fead8f4426168bd7c89bc483a450bc26abee9..6fae6014073eae9bffcd3ef92e8029ef24b99eed 100644 (file)
--- a/board/socrates/Makefile
+++ b/board/socrates/Makefile
@@ -28,10 +28,15 @@ include $(TOPDIR)/config.mk
 LIB    = $(obj)lib$(BOARD).a
 #
 
-COBJS  := $(BOARD).o law.o tlb.o sdram.o nand.o
-
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS))
+COBJS-y        += $(BOARD).o
+COBJS-y        += law.o
+COBJS-y        += tlb.o
+COBJS-y        += nand.o
+COBJS-y        += sdram.o
+COBJS-$(CONFIG_FSL_DDR2) += ddr.o
+
+SRCS   := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS-y))
 SOBJS  := $(addprefix $(obj),$(SOBJS))
 
 $(LIB):        $(obj).depend $(OBJS) $(SOBJS)