Merge with /home/sr/git/u-boot/cfi-flash

[oweals/u-boot.git] / board / esd / pmc405 / Makefile

diff --git a/board/esd/pmc405/Makefile b/board/esd/pmc405/Makefile
index 2fa097a09cb0f311530a594dd1f7d34de359c416..741e4aacdcd4ede64069113dce79a5b480649118 100644 (file)
--- a/board/esd/pmc405/Makefile
+++ b/board/esd/pmc405/Makefile
@@ -25,10 +25,15 @@ include $(TOPDIR)/config.mk
 
 LIB    = lib$(BOARD).a
 
-OBJS   = $(BOARD).o strataflash.o
+# Objects for Xilinx JTAG programming (CPLD)
+CPLD    = ../common/xilinx_jtag/lenval.o \
+         ../common/xilinx_jtag/micro.o \
+         ../common/xilinx_jtag/ports.o
+
+OBJS   = $(BOARD).o ../common/misc.o ../common/cmd_loadpci.o $(CPLD)
 
 $(LIB):        $(OBJS) $(SOBJS)
-       $(AR) crv $@ $^
+       $(AR) crv $@ $(OBJS)
 
 clean:
        rm -f $(SOBJS) $(OBJS)