Message ID | 1382009936-17610-4-git-send-email-yamada.m@jp.panasonic.com |
---|---|
State | Accepted |
Delegated to: | Tom Rini |
Headers | show |
Hi Masahiro, On Thu, Oct 17, 2013 at 5:38 AM, Masahiro Yamada <yamada.m@jp.panasonic.com> wrote: > This commit moves some subdirectories of fs > from the toplevel Makefile to fs/Makefile > using Kbuild descending feature. > > Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> > --- > > Changes for v4: > - No change > > Changes for v3: > - No change > > Changes for v2: > - No change > > Makefile | 12 +----------- > fs/Makefile | 11 +++++++++++ > 2 files changed, 12 insertions(+), 11 deletions(-) > > diff --git a/Makefile b/Makefile > index 75e93c4..ba521e1 100644 > --- a/Makefile > +++ b/Makefile > @@ -248,17 +248,7 @@ endif > LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o > LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o > LIBS-y += fs/libfs.o \ > - fs/cbfs/libcbfs.o \ > - fs/cramfs/libcramfs.o \ > - fs/ext4/libext4fs.o \ > - fs/fat/libfat.o \ > - fs/fdos/libfdos.o \ > - fs/jffs2/libjffs2.o \ > - fs/reiserfs/libreiserfs.o \ > - fs/sandbox/libsandboxfs.o \ > - fs/ubifs/libubifs.o \ > - fs/yaffs2/libyaffs2.o \ > - fs/zfs/libzfs.o > + fs/fat/libfat.o Why do you keep libfat here? Regards, Simon
Hello Simon. > > diff --git a/Makefile b/Makefile > > index 75e93c4..ba521e1 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -248,17 +248,7 @@ endif > > LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o > > LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o > > LIBS-y += fs/libfs.o \ > > - fs/cbfs/libcbfs.o \ > > - fs/cramfs/libcramfs.o \ > > - fs/ext4/libext4fs.o \ > > - fs/fat/libfat.o \ > > - fs/fdos/libfdos.o \ > > - fs/jffs2/libjffs2.o \ > > - fs/reiserfs/libreiserfs.o \ > > - fs/sandbox/libsandboxfs.o \ > > - fs/ubifs/libubifs.o \ > > - fs/yaffs2/libyaffs2.o \ > > - fs/zfs/libzfs.o > > + fs/fat/libfat.o > > Why do you keep libfat here? Please see around line 88 of spl/Makefile LIBS-$(CONFIG_SPL_FAT_SUPPORT) += fs/fat/libfat.o fs/fat/ is invoked also from spl/Makefile. In order to move libfat, we need treak more. Of course we can do this refactoring, but it might be a little beyond the series and I was afraid reviewers might be confused. That's why I decided to postpone to move libfat. OK. I will post the follow-up patch to move libfat. Best Regards Masahiro Yamada
On Thu, Oct 17, 2013 at 6:58 PM, Masahiro Yamada <yamada.m@jp.panasonic.com>wrote: > Hello Simon. > > > > > diff --git a/Makefile b/Makefile > > > index 75e93c4..ba521e1 100644 > > > --- a/Makefile > > > +++ b/Makefile > > > @@ -248,17 +248,7 @@ endif > > > LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o > > > LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o > > > LIBS-y += fs/libfs.o \ > > > - fs/cbfs/libcbfs.o \ > > > - fs/cramfs/libcramfs.o \ > > > - fs/ext4/libext4fs.o \ > > > - fs/fat/libfat.o \ > > > - fs/fdos/libfdos.o \ > > > - fs/jffs2/libjffs2.o \ > > > - fs/reiserfs/libreiserfs.o \ > > > - fs/sandbox/libsandboxfs.o \ > > > - fs/ubifs/libubifs.o \ > > > - fs/yaffs2/libyaffs2.o \ > > > - fs/zfs/libzfs.o > > > + fs/fat/libfat.o > > > > Why do you keep libfat here? > > > > Please see around line 88 of spl/Makefile > > LIBS-$(CONFIG_SPL_FAT_SUPPORT) += fs/fat/libfat.o > > > fs/fat/ is invoked also from spl/Makefile. > > > In order to move libfat, we need treak more. > Of course we can do this refactoring, > but it might be a little beyond the series > and I was afraid reviewers might be confused. > > That's why I decided to postpone to move libfat. > OK. Acked-by: Simon Glass <sjg@chromium.org> > > > > OK. I will post the follow-up patch > to move libfat. > > > > > Best Regards > Masahiro Yamada > >
diff --git a/Makefile b/Makefile index 75e93c4..ba521e1 100644 --- a/Makefile +++ b/Makefile @@ -248,17 +248,7 @@ endif LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o LIBS-y += fs/libfs.o \ - fs/cbfs/libcbfs.o \ - fs/cramfs/libcramfs.o \ - fs/ext4/libext4fs.o \ - fs/fat/libfat.o \ - fs/fdos/libfdos.o \ - fs/jffs2/libjffs2.o \ - fs/reiserfs/libreiserfs.o \ - fs/sandbox/libsandboxfs.o \ - fs/ubifs/libubifs.o \ - fs/yaffs2/libyaffs2.o \ - fs/zfs/libzfs.o + fs/fat/libfat.o LIBS-y += net/libnet.o LIBS-y += disk/libdisk.o LIBS-y += drivers/libdrivers.o diff --git a/fs/Makefile b/fs/Makefile index ea2eb09..bdcd746 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -7,3 +7,14 @@ # obj-y += fs.o + +obj-y += cbfs/ +obj-y += cramfs/ +obj-y += ext4/ +obj-y += fdos/ +obj-y += jffs2/ +obj-y += reiserfs/ +obj-y += sandbox/ +obj-y += ubifs/ +obj-y += yaffs2/ +obj-y += zfs/
This commit moves some subdirectories of fs from the toplevel Makefile to fs/Makefile using Kbuild descending feature. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> --- Changes for v4: - No change Changes for v3: - No change Changes for v2: - No change Makefile | 12 +----------- fs/Makefile | 11 +++++++++++ 2 files changed, 12 insertions(+), 11 deletions(-)