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

[karo-tx-uboot.git] / board / bf537-stamp / Makefile

diff --git a/board/bf537-stamp/Makefile b/board/bf537-stamp/Makefile
index ea8c43680b834e1ca5abe481878fffabb3cf2730..2b9328be32ae51fd63cf3485741389a3d174c06e 100644 (file)
--- a/board/bf537-stamp/Makefile
+++ b/board/bf537-stamp/Makefile
@@ -27,26 +27,24 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = $(obj)lib$(BOARD).a
+LIB    = $(obj)lib$(BOARD).o
 
-COBJS  := $(BOARD).o post-memory.o spi_flash.o cmd_bf537led.o nand.o
+COBJS-y        := $(BOARD).o
+COBJS-$(CONFIG_BFIN_IDE)   += ide-cf.o
+COBJS-$(CONFIG_HAS_POST)   += post.o post-memory.o
 
-SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(COBJS))
-SOBJS  := $(addprefix $(obj),$(SOBJS))
+SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS-y))
+SOBJS  := $(addprefix $(obj),$(SOBJS-y))
 
-$(LIB):        $(obj).depend $(OBJS) $(SOBJS) u-boot.lds
-       $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
-
-u-boot.lds: u-boot.lds.S
-       $(CPP) $(CPPFLAGS) -D__ASSEMBLY__ -P -Ubfin $^ > $@.tmp
-       mv -f $@.tmp $@
+$(LIB):        $(obj).depend $(OBJS) $(SOBJS)
+       $(call cmd_link_o_target, $(OBJS) $(SOBJS))
 
 clean:
        rm -f $(SOBJS) $(OBJS)
 
 distclean:     clean
-       rm -f $(LIB) core *.bak .depend
+       rm -f $(LIB) core *.bak $(obj).depend
 
 #########################################################################