diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-01-15 11:10:33 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-01-15 11:16:47 +0100 |
| commit | f098337152ca48e135448f5e7836cce938e12bc0 (patch) | |
| tree | 3035f5896ddf0f18fe059543eb145bc7c9c56e73 /include | |
| parent | 2ff6922280025c1315c53fa2eb4ab33f0c9591de (diff) | |
| download | u-boot-imx-f098337152ca48e135448f5e7836cce938e12bc0.zip u-boot-imx-f098337152ca48e135448f5e7836cce938e12bc0.tar.gz u-boot-imx-f098337152ca48e135448f5e7836cce938e12bc0.tar.bz2 | |
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 <wd@denx.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/jffs2/jffs2.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/jffs2/jffs2.h b/include/jffs2/jffs2.h index ed96bab..651f94c 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); |