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 /fs/jffs2/jffs2_1pass.c | |
| 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 'fs/jffs2/jffs2_1pass.c')
| -rw-r--r-- | fs/jffs2/jffs2_1pass.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 1923ed9..93651f5 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -471,9 +471,8 @@ static char *compr_names[] = { "COPY", "DYNRUBIN", "ZLIB", -#if defined(CONFIG_JFFS2_LZO_LZARI) +#if defined(CONFIG_JFFS2_LZO) "LZO", - "LZARI", #endif }; @@ -781,13 +780,10 @@ jffs2_1pass_read_inode(struct b_lists *pL, u32 inode, char *dest) case JFFS2_COMPR_ZLIB: ret = zlib_decompress(src, lDest, jNode->csize, jNode->dsize); break; -#if defined(CONFIG_JFFS2_LZO_LZARI) +#if defined(CONFIG_JFFS2_LZO) case JFFS2_COMPR_LZO: ret = lzo_decompress(src, lDest, jNode->csize, jNode->dsize); break; - case JFFS2_COMPR_LZARI: - ret = lzari_decompress(src, lDest, jNode->csize, jNode->dsize); - break; #endif default: /* unknown */ |