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

[u-boot] / board / amcc / kilauea / Makefile

diff --git a/board/amcc/kilauea/Makefile b/board/amcc/kilauea/Makefile
index 39328c2bda6a29f9c7c849bd8c67c3a3770d258a..726c3ce4f1b4ac85a3df4899f3af3aebdaf51a66 100644 (file)
--- a/board/amcc/kilauea/Makefile
+++ b/board/amcc/kilauea/Makefile
@@ -23,22 +23,23 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = $(obj)lib$(BOARD).a
+LIB    = $(obj)lib$(BOARD).o
 
-COBJS  = $(BOARD).o cmd_pll.o memory.o
-SOBJS  = init.o
+COBJS-y        := $(BOARD).o
+COBJS-$(CONFIG_CMD_CHIP_CONFIG) += chip_config.o
 
+COBJS   := $(COBJS-y)
 SRCS   := $(SOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
 
 $(LIB):        $(obj).depend $(OBJS)
-       $(AR) $(ARFLAGS) $@ $(OBJS)
+       $(call cmd_link_o_target, $(OBJS))
 
 clean:
        rm -f $(OBJS)
 
 distclean:     clean
-       rm -f $(LIB) core *.bak .depend *~
+       rm -f $(LIB) core *.bak $(obj).depend
 
 #########################################################################