Skip to content

Commit

Permalink
fs: descend into sub directories when it is necessary
Browse files Browse the repository at this point in the history
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
  • Loading branch information
masahir0y authored and trini committed Nov 17, 2013
1 parent 57c3e5f commit 4678d74
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 25 deletions.
20 changes: 10 additions & 10 deletions fs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ obj-$(CONFIG_SPL_FAT_SUPPORT) += fat/
else
obj-y += fs.o

obj-y += cbfs/
obj-y += cramfs/
obj-y += ext4/
obj-$(CONFIG_CMD_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_CMD_FDOS) += fdos/
obj-$(CONFIG_CMD_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
2 changes: 1 addition & 1 deletion fs/cbfs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# SPDX-License-Identifier: GPL-2.0+
#

obj-$(CONFIG_CMD_CBFS) := cbfs.o
obj-y := cbfs.o
4 changes: 2 additions & 2 deletions fs/cramfs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
# SPDX-License-Identifier: GPL-2.0+
#

obj-$(CONFIG_CMD_CRAMFS) := cramfs.o
obj-$(CONFIG_CMD_CRAMFS) += uncompress.o
obj-y := cramfs.o
obj-y += uncompress.o
2 changes: 1 addition & 1 deletion fs/ext4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# SPDX-License-Identifier: GPL-2.0+
#

obj-$(CONFIG_FS_EXT4) := ext4fs.o ext4_common.o dev.o
obj-y := ext4fs.o ext4_common.o dev.o
obj-$(CONFIG_EXT4_WRITE) += ext4_write.o ext4_journal.o crc16.o
2 changes: 1 addition & 1 deletion fs/fdos/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
# SPDX-License-Identifier: GPL-2.0+
#

obj-$(CONFIG_CMD_FDOS) := fat.o vfat.o dev.o fdos.o fs.o subdir.o
obj-y := fat.o vfat.o dev.o fdos.o fs.o subdir.o
2 changes: 0 additions & 2 deletions fs/jffs2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@
# SPDX-License-Identifier: GPL-2.0+
#

ifdef CONFIG_CMD_JFFS2
obj-$(CONFIG_JFFS2_LZO) += compr_lzo.o
obj-y += compr_rtime.o
obj-y += compr_rubin.o
obj-y += compr_zlib.o
obj-y += jffs2_1pass.o
obj-y += mini_inflate.o
endif
2 changes: 1 addition & 1 deletion fs/reiserfs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
# SPDX-License-Identifier: GPL-2.0+
#

obj-$(CONFIG_CMD_REISER) := reiserfs.o dev.o mode_string.o
obj-y := reiserfs.o dev.o mode_string.o
2 changes: 1 addition & 1 deletion fs/sandbox/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
# SPDX-License-Identifier: GPL-2.0+
#

obj-$(CONFIG_SANDBOX) := sandboxfs.o
obj-y := sandboxfs.o
8 changes: 4 additions & 4 deletions fs/ubifs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
# SPDX-License-Identifier: GPL-2.0+
#

obj-$(CONFIG_CMD_UBIFS) := ubifs.o io.o super.o sb.o master.o lpt.o
obj-$(CONFIG_CMD_UBIFS) += lpt_commit.o scan.o lprops.o
obj-$(CONFIG_CMD_UBIFS) += tnc.o tnc_misc.o debug.o crc16.o budget.o
obj-$(CONFIG_CMD_UBIFS) += log.o orphan.o recovery.o replay.o
obj-y := ubifs.o io.o super.o sb.o master.o lpt.o
obj-y += lpt_commit.o scan.o lprops.o
obj-y += tnc.o tnc_misc.o debug.o crc16.o budget.o
obj-y += log.o orphan.o recovery.o replay.o

# SEE README.arm-unaligned-accesses
$(obj)super.o: CFLAGS += $(PLATFORM_NO_UNALIGNED)
2 changes: 1 addition & 1 deletion fs/yaffs2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#
# $Id: Makefile,v 1.15 2007/07/18 19:40:38 charles Exp $

obj-$(CONFIG_YAFFS2) := \
obj-y := \
yaffs_allocator.o yaffs_attribs.o yaffs_bitmap.o yaffs_uboot_glue.o\
yaffs_checkptrw.o yaffs_ecc.o yaffs_error.o \
yaffsfs.o yaffs_guts.o yaffs_nameval.o yaffs_nand.o\
Expand Down
2 changes: 1 addition & 1 deletion fs/zfs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# SPDX-License-Identifier: GPL-2.0+
#

obj-$(CONFIG_CMD_ZFS) := dev.o zfs.o zfs_fletcher.o zfs_sha256.o zfs_lzjb.o
obj-y := dev.o zfs.o zfs_fletcher.o zfs_sha256.o zfs_lzjb.o

0 comments on commit 4678d74

Please sign in to comment.