summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-11-11 14:36:09 +0900
committerTom Rini <trini@ti.com>2013-11-17 14:11:34 -0500
commit57c3e5fcf2cbc791d9507c8b8c09df1ef21c043a (patch)
treeb2a80a01edbdbb0b5c8664d8c8840a538f44ceff
parenta52f90f074a84880f8cb13e060e9ca5f3c7d9c2f (diff)
downloadblackbird-obmc-uboot-57c3e5fcf2cbc791d9507c8b8c09df1ef21c043a.tar.gz
blackbird-obmc-uboot-57c3e5fcf2cbc791d9507c8b8c09df1ef21c043a.zip
Makefile: move fs/fat/ entry to drivers/Makefile
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Simon Glass <sjg@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r--Makefile3
-rw-r--r--fs/Makefile5
-rw-r--r--spl/Makefile2
3 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index c04917f60d..b8713a4935 100644
--- a/Makefile
+++ b/Makefile
@@ -243,8 +243,7 @@ endif
LIBS-$(CONFIG_IXP4XX_NPE) += drivers/net/npe/
LIBS-$(CONFIG_OF_EMBED) += dts/
LIBS-y += arch/$(ARCH)/lib/
-LIBS-y += fs/ \
- fs/fat/
+LIBS-y += fs/
LIBS-y += net/
LIBS-y += disk/
LIBS-y += drivers/
diff --git a/fs/Makefile b/fs/Makefile
index bdcd74631d..ee01a7d4a1 100644
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -6,11 +6,15 @@
# SPDX-License-Identifier: GPL-2.0+
#
+ifdef CONFIG_SPL_BUILD
+obj-$(CONFIG_SPL_FAT_SUPPORT) += fat/
+else
obj-y += fs.o
obj-y += cbfs/
obj-y += cramfs/
obj-y += ext4/
+obj-y += fat/
obj-y += fdos/
obj-y += jffs2/
obj-y += reiserfs/
@@ -18,3 +22,4 @@ obj-y += sandbox/
obj-y += ubifs/
obj-y += yaffs2/
obj-y += zfs/
+endif
diff --git a/spl/Makefile b/spl/Makefile
index 5bc75b4bce..29d7818df5 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -73,7 +73,7 @@ LIBS-$(CONFIG_SPL_MMC_SUPPORT) += drivers/mmc/
LIBS-$(CONFIG_SPL_SERIAL_SUPPORT) += drivers/serial/
LIBS-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += drivers/mtd/spi/
LIBS-$(CONFIG_SPL_SPI_SUPPORT) += drivers/spi/
-LIBS-$(CONFIG_SPL_FAT_SUPPORT) += fs/fat/
+LIBS-y += fs/
LIBS-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/
LIBS-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/ \
drivers/power/pmic/
OpenPOWER on IntegriCloud