fs: separate CONFIG_FS_{FAT, EXT4} from CONFIG_CMD_{FAT, EXT*}

[oweals/u-boot.git] / fs / fat / Makefile

diff --git a/fs/fat/Makefile b/fs/fat/Makefile
index b711460f3a83b9ff0846c4dd599ea9ac1cc35d22..969715bf9ca6e387e4e5164f8c04e1338d7fa288 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_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))
@@ -32,8 +37,10 @@ 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)
 
 #########################################################################