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

[oweals/u-boot.git] / board / tqc / tqm85xx / Makefile

diff --git a/board/tqc/tqm85xx/Makefile b/board/tqc/tqm85xx/Makefile
index 52f5ef9454a4e3e8155574fa08bc017d633a25a2..adda9d45b793ccca3e2cb7b3fba63ad5adb301e9 100644 (file)
--- a/board/tqc/tqm85xx/Makefile
+++ b/board/tqc/tqm85xx/Makefile
@@ -25,8 +25,14 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)lib$(BOARD).a
 
-COBJS  := $(BOARD).o sdram.o law.o tlb.o
+COBJS-y        += $(BOARD).o
+COBJS-y        += sdram.o
+COBJS-y        += law.o
+COBJS-y        += tlb.o
 
+COBJS-$(CONFIG_NAND) += nand.o
+
+COBJS  := $(COBJS-y)
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(COBJS))
 SOBJS  := $(addprefix $(obj),$(SOBJS))
@@ -38,7 +44,7 @@ clean:
        rm -f $(OBJS) $(SOBJS)
 
 distclean:     clean
-       rm -f $(LIB) core *.bak .depend
+       rm -f $(LIB) core *.bak $(obj).depend
 
 #########################################################################