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 bc45966..969715b 100644 (file)
--- a/fs/fat/Makefile
+++ b/fs/fat/Makefile
@@ -24,7 +24,12 @@ include $(TOPDIR)/config.mk
 LIB    = $(obj)libfat.o
 
 AOBJS  =
-COBJS-$(CONFIG_CMD_FAT)        := fat.o file.o
+COBJS-$(CONFIG_FS_FAT) := fat.o
+COBJS-$(CONFIG_FAT_WRITE):= fat_write.o
+
+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))
@@ -34,6 +39,8 @@ all:  $(LIB) $(AOBJS)
 $(LIB):        $(obj).depend $(OBJS)
        $(call cmd_link_o_target, $(OBJS))
 
+# SEE README.arm-unaligned-accesses
+$(obj)file.o: CFLAGS += $(PLATFORM_NO_UNALIGNED)
 
 #########################################################################