From f098337152ca48e135448f5e7836cce938e12bc0 Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Fri, 15 Jan 2010 11:10:33 +0100 Subject: JFFS2: drop support for LZARI compression mode Support for LZARI compression mode was added based on a MTD CVS snapshot of March 13, 2005. However, fs/jffs2/compr_lzari.c contains contradictory licensing terms: the original copyright clause says "All rights reserved. Permission granted for non-commercial use.", but later reference to the file 'LICENCE' in the jffs2 directory was added which says GPL v2 or later. As no boards ever used LZARI compression, and this file is also not present in recent MTD code, we resolve this conflict by removing the conflicting file and references to it. Also copy the referenced but missing file 'LICENCE' from the current MTD source tree. Signed-off-by: Wolfgang Denk --- include/jffs2/jffs2.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'include/jffs2') diff --git a/include/jffs2/jffs2.h b/include/jffs2/jffs2.h index ed96babf61..651f94cf38 100644 --- a/include/jffs2/jffs2.h +++ b/include/jffs2/jffs2.h @@ -68,10 +68,9 @@ #define JFFS2_COMPR_COPY 0x04 #define JFFS2_COMPR_DYNRUBIN 0x05 #define JFFS2_COMPR_ZLIB 0x06 -#if defined(CONFIG_JFFS2_LZO_LZARI) +#if defined(CONFIG_JFFS2_LZO) #define JFFS2_COMPR_LZO 0x07 -#define JFFS2_COMPR_LZARI 0x08 -#define JFFS2_NUM_COMPR 9 +#define JFFS2_NUM_COMPR 8 #else #define JFFS2_NUM_COMPR 7 #endif @@ -226,11 +225,9 @@ void dynrubin_decompress(unsigned char *data_in, unsigned char *cpage_out, unsigned long sourcelen, unsigned long dstlen); long zlib_decompress(unsigned char *data_in, unsigned char *cpage_out, __u32 srclen, __u32 destlen); -#if defined(CONFIG_JFFS2_LZO_LZARI) +#if defined(CONFIG_JFFS2_LZO) int lzo_decompress(unsigned char *data_in, unsigned char *cpage_out, u32 srclen, u32 destlen); -int lzari_decompress(unsigned char *data_in, unsigned char *cpage_out, - u32 srclen, u32 destlen); #endif char *mkmodestr(unsigned long mode, char *str); -- cgit