| Message ID | 1384148170-28079-22-git-send-email-yamada.m@jp.panasonic.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Sun, Nov 10, 2013 at 10:36 PM, Masahiro Yamada <yamada.m@jp.panasonic.com> wrote: > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> > Cc: Simon Glass <sjg@chromium.org> Acked-by: Simon Glass <sjg@chromium.org> > --- > Makefile | 3 +-- > fs/Makefile | 5 +++++ > spl/Makefile | 2 +- > 3 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/Makefile b/Makefile > index c04917f..b8713a4 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 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/ > -- > 1.8.3.2 >
diff --git a/Makefile b/Makefile index c04917f..b8713a4 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 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/
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Simon Glass <sjg@chromium.org> --- Makefile | 3 +-- fs/Makefile | 5 +++++ spl/Makefile | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-)