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

[u-boot] / fs / Makefile

diff --git a/fs/Makefile b/fs/Makefile
index ee01a7d4a10779146befae73b4c8f9d76dc5b9b4..8a8175b7af3aec91cc4f14ef7ab44d268915ac77 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -8,18 +8,20 @@
 
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_SPL_FAT_SUPPORT) += fat/
+obj-$(CONFIG_SPL_EXT_SUPPORT) += ext4/
 else
 obj-y                          += fs.o
 
-obj-y += cbfs/
-obj-y += cramfs/
-obj-y += ext4/
+obj-$(CONFIG_FS_BTRFS) += btrfs/
+obj-$(CONFIG_FS_CBFS) += cbfs/
+obj-$(CONFIG_CMD_CRAMFS) += cramfs/
+obj-$(CONFIG_FS_EXT4) += ext4/
 obj-y += fat/
-obj-y += fdos/
-obj-y += jffs2/
-obj-y += reiserfs/
-obj-y += sandbox/
-obj-y += ubifs/
-obj-y += yaffs2/
-obj-y += zfs/
+obj-$(CONFIG_FS_JFFS2) += jffs2/
+obj-$(CONFIG_CMD_REISER) += reiserfs/
+obj-$(CONFIG_SANDBOX) += sandbox/
+obj-$(CONFIG_CMD_UBIFS) += ubifs/
+obj-$(CONFIG_YAFFS2) += yaffs2/
+obj-$(CONFIG_CMD_ZFS) += zfs/
 endif
+obj-y += fs_internal.o