Merge git://git.denx.de/u-boot

[platform/kernel/u-boot.git] / fs / fat / Makefile

diff --git a/fs/fat/Makefile b/fs/fat/Makefile
index 87af73b..969715b 100644 (file)
--- a/fs/fat/Makefile
+++ b/fs/fat/Makefile
@@ -21,19 +21,26 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = $(obj)libfat.a
+LIB    = $(obj)libfat.o
 
 AOBJS  =
-COBJS  = fat.o file.o
+COBJS-$(CONFIG_FS_FAT) := fat.o
+COBJS-$(CONFIG_FAT_WRITE):= fat_write.o
 
-SRCS   := $(AOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(AOBJS) $(COBJS))
+ifndef CONFIG_SPL_BUILD
+COBJS-$(CONFIG_FS_FAT) += file.o
+endif
+
+SRCS   := $(AOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS   := $(addprefix $(obj),$(AOBJS) $(COBJS-y))
 
 all:   $(LIB) $(AOBJS)
 
 $(LIB):        $(obj).depend $(OBJS)
-       $(AR) $(ARFLAGS) $@ $(OBJS)
+       $(call cmd_link_o_target, $(OBJS))
 
+# SEE README.arm-unaligned-accesses
+$(obj)file.o: CFLAGS += $(PLATFORM_NO_UNALIGNED)
 
 #########################################################################