Browse Source

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>
Masahiro Yamada 10 years ago
parent
commit
57c3e5fcf2
3 changed files with 7 additions and 3 deletions
  1. 1 2
      Makefile
  2. 5 0
      fs/Makefile
  3. 1 1
      spl/Makefile

+ 1 - 2
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/

+ 5 - 0
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

+ 1 - 1
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/