Merge branch 'next' of ../next

[karo-tx-uboot.git] / fs / fat / Makefile

diff --git a/fs/fat/Makefile b/fs/fat/Makefile
index b711460f3a83b9ff0846c4dd599ea9ac1cc35d22..9635d36fcf9caa4f2023c94b9a48bd08ec13517b 100644 (file)
--- a/fs/fat/Makefile
+++ b/fs/fat/Makefile
@@ -21,10 +21,15 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = $(obj)libfat.a
+LIB    = $(obj)libfat.o
 
 AOBJS  =
-COBJS-$(CONFIG_CMD_FAT)        := fat.o file.o
+COBJS-$(CONFIG_CMD_FAT)        := fat.o
+COBJS-$(CONFIG_FAT_WRITE):= fat_write.o
+
+ifndef CONFIG_SPL_BUILD
+COBJS-$(CONFIG_CMD_FAT)        += file.o
+endif
 
 SRCS   := $(AOBJS:.o=.S) $(COBJS-y:.o=.c)
 OBJS   := $(addprefix $(obj),$(AOBJS) $(COBJS-y))
@@ -32,7 +37,7 @@ OBJS  := $(addprefix $(obj),$(AOBJS) $(COBJS-y))
 all:   $(LIB) $(AOBJS)
 
 $(LIB):        $(obj).depend $(OBJS)
-       $(AR) $(ARFLAGS) $@ $(OBJS)
+       $(call cmd_link_o_target, $(OBJS))
 
 
 #########################################################################