diff options
author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2013-11-11 14:36:09 +0900 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-11-17 14:11:34 -0500 |
commit | 57c3e5fcf2cbc791d9507c8b8c09df1ef21c043a (patch) | |
tree | b2a80a01edbdbb0b5c8664d8c8840a538f44ceff | |
parent | a52f90f074a84880f8cb13e060e9ca5f3c7d9c2f (diff) | |
download | u-boot-57c3e5fcf2cbc791d9507c8b8c09df1ef21c043a.zip u-boot-57c3e5fcf2cbc791d9507c8b8c09df1ef21c043a.tar.gz u-boot-57c3e5fcf2cbc791d9507c8b8c09df1ef21c043a.tar.bz2 |
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-- | Makefile | 3 | ||||
-rw-r--r-- | fs/Makefile | 5 | ||||
-rw-r--r-- | spl/Makefile | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -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 bdcd746..ee01a7d 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 5bc75b4..29d7818 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/ |