summaryrefslogtreecommitdiff
path: root/board/pm854/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-08-28 00:26:52 +0200
committerWolfgang Denk <wd@denx.de>2008-08-28 00:26:52 +0200
commit0ba6bfef061872dbe04e6bebbb225806c7fa34ec (patch)
tree25d0e07c2d902998c3a679aaf6bf4ffedff9289c /board/pm854/Makefile
parentd26b739afe5a6760bd345743188759cd9d0f3b47 (diff)
parent9cff4448a9cb882defe6c8bde73b77fc0c636799 (diff)
downloadu-boot-imx-0ba6bfef061872dbe04e6bebbb225806c7fa34ec.zip
u-boot-imx-0ba6bfef061872dbe04e6bebbb225806c7fa34ec.tar.gz
u-boot-imx-0ba6bfef061872dbe04e6bebbb225806c7fa34ec.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'board/pm854/Makefile')
-rw-r--r--board/pm854/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/board/pm854/Makefile b/board/pm854/Makefile
index 2d71cbc..52a756c 100644
--- a/board/pm854/Makefile
+++ b/board/pm854/Makefile
@@ -25,10 +25,13 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-COBJS := $(BOARD).o law.o tlb.o
+COBJS-y += $(BOARD).o
+COBJS-y += law.o
+COBJS-y += tlb.o
+COBJS-$(CONFIG_FSL_DDR1) += ddr.o
-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)