diff options
| author | Tom Rini <trini@ti.com> | 2012-09-20 11:27:35 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-09-20 11:27:35 -0700 |
| commit | 5fb29f3c48d26981b117b08286bc16ec99d4ca0b (patch) | |
| tree | b4a4c5b5cc88fedc568bcb49e248e9561a884ef4 /Makefile | |
| parent | 30a3f3881e44187f21eb08bf8601ed4adaf4ca0e (diff) | |
| parent | 55b523b7d4ab885142f77d388007eb5490ba6bf4 (diff) | |
| download | u-boot-5fb29f3c48d26981b117b08286bc16ec99d4ca0b.tar.gz u-boot-5fb29f3c48d26981b117b08286bc16ec99d4ca0b.tar.bz2 u-boot-5fb29f3c48d26981b117b08286bc16ec99d4ca0b.zip | |
Merge branch 'ext4'
Update Makefile change for LIBS -> LIBS-y change.
Conflicts:
Makefile
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -242,9 +242,15 @@ LIBS-y += arch/arm/cpu/ixp/npe/libnpe.o endif LIBS-$(CONFIG_OF_EMBED) += dts/libdts.o LIBS-y += arch/$(ARCH)/lib/lib$(ARCH).o -LIBS-y += fs/cramfs/libcramfs.o fs/fat/libfat.o fs/fdos/libfdos.o fs/jffs2/libjffs2.o \ - fs/reiserfs/libreiserfs.o fs/ext2/libext2fs.o fs/yaffs2/libyaffs2.o \ - fs/ubifs/libubifs.o fs/zfs/libzfs.o +LIBS-y += 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/ubifs/libubifs.o \ + fs/yaffs2/libyaffs2.o \ + fs/zfs/libzfs.o LIBS-y += net/libnet.o LIBS-y += disk/libdisk.o LIBS-y += drivers/bios_emulator/libatibiosemu.o |