diff options
| author | Tom Rini <trini@ti.com> | 2012-09-20 11:27:35 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-20 11:27:35 -0700 |
| commit | 5fb29f3c48d26981b117b08286bc16ec99d4ca0b (patch) | |
| tree | b4a4c5b5cc88fedc568bcb49e248e9561a884ef4 /fs/Makefile | |
| parent | 30a3f3881e44187f21eb08bf8601ed4adaf4ca0e (diff) | |
| parent | 55b523b7d4ab885142f77d388007eb5490ba6bf4 (diff) | |
| download | u-boot-imx-5fb29f3c48d26981b117b08286bc16ec99d4ca0b.zip u-boot-imx-5fb29f3c48d26981b117b08286bc16ec99d4ca0b.tar.gz u-boot-imx-5fb29f3c48d26981b117b08286bc16ec99d4ca0b.tar.bz2 | |
Merge branch 'ext4'
Update Makefile change for LIBS -> LIBS-y change.
Conflicts:
Makefile
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/Makefile b/fs/Makefile index 28da76e..901e189 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -23,7 +23,10 @@ # subdirs-$(CONFIG_CMD_CRAMFS) := cramfs -subdirs-$(CONFIG_CMD_EXT2) += ext2 +subdirs-$(CONFIG_CMD_EXT4) += ext4 +ifndef CONFIG_CMD_EXT4 +subdirs-$(CONFIG_CMD_EXT2) += ext4 +endif subdirs-$(CONFIG_CMD_FAT) += fat subdirs-$(CONFIG_CMD_FDOS) += fdos subdirs-$(CONFIG_CMD_JFFS2) += jffs2 |