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

[people/ms/u-boot.git] / fs / Makefile

diff --git a/fs/Makefile b/fs/Makefile
index 18221658fcbd3d79c80ab07c1b53183831cdc451..5770f41c0b01a1a9b87220b09a842bdec25f24b9 100644 (file)
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -8,14 +8,15 @@
 
 ifdef CONFIG_SPL_BUILD
 obj-$(CONFIG_SPL_FAT_SUPPORT) += fat/
+obj-$(CONFIG_SPL_EXT_SUPPORT) += ext4/
 else
 obj-y                          += fs.o
 
-obj-$(CONFIG_CMD_CBFS) += cbfs/
+obj-$(CONFIG_FS_CBFS) += cbfs/
 obj-$(CONFIG_CMD_CRAMFS) += cramfs/
 obj-$(CONFIG_FS_EXT4) += ext4/
 obj-y += fat/
-obj-$(CONFIG_CMD_JFFS2) += jffs2/
+obj-$(CONFIG_FS_JFFS2) += jffs2/
 obj-$(CONFIG_CMD_REISER) += reiserfs/
 obj-$(CONFIG_SANDBOX) += sandbox/
 obj-$(CONFIG_CMD_UBIFS) += ubifs/