1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-24 06:55:31 +02:00
openwrt-xburst/tools/mtd-utils/patches/100-optional_lzo.patch
nbd 9f28e5bd03 upgrade to a more recent version of mtd-utils - preparation for adding UBI support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16455 3c298f89-4303-0410-b956-a3cf2f4a3e73
2009-06-14 20:42:12 +00:00

33 lines
868 B
Diff

--- a/Makefile
+++ b/Makefile
@@ -36,10 +36,16 @@ $(SYMLINKS):
ln -sf ../fs/jffs2/$@ $@
$(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\
- crc32.o compr_rtime.o mkfs.jffs2.o compr_zlib.o compr_lzo.o \
+ crc32.o compr_rtime.o mkfs.jffs2.o compr_zlib.o $(if $(NO_LZO),,compr_lzo.o) \
compr.o rbtree.o)
-LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS)
-LDLIBS_mkfs.jffs2 = -lz -llzo2
+
+LDFLAGS_mkfs.jffs2 := $(ZLIBLDFLAGS)
+LDLIBS_mkfs.jffs2 := -lz
+ifndef NO_LZO
+LDFLAGS_mkfs.jffs2 += $(LZOLDFLAGS)
+LDLIBS_mkfs.jffs2 += -llzo2
+CPPFLAGS += -DCONFIG_JFFS2_LZO
+endif
$(BUILDDIR)/flash_eraseall: $(BUILDDIR)/crc32.o $(BUILDDIR)/flash_eraseall.o
--- a/compr.h
+++ b/compr.h
@@ -18,7 +18,6 @@
#define CONFIG_JFFS2_ZLIB
#define CONFIG_JFFS2_RTIME
-#define CONFIG_JFFS2_LZO
#define JFFS2_RUBINMIPS_PRIORITY 10
#define JFFS2_DYNRUBIN_PRIORITY 20