| 1234567891011121314151617181920212223242526272829303132 |
- --- 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
|
