diff options
| author | wdenk <wdenk> | 2005-05-05 00:04:14 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2005-05-05 00:04:14 +0000 |
| commit | 07cc0999413481568b38b8d0e5f3d7514d9540b0 (patch) | |
| tree | 56955f165a6a1c2647acbaaa8f5783b3b74277c9 /include | |
| parent | cf8bc5773c27adf325d7bb1a90d290b213a57417 (diff) | |
| download | u-boot-imx-07cc0999413481568b38b8d0e5f3d7514d9540b0.zip u-boot-imx-07cc0999413481568b38b8d0e5f3d7514d9540b0.tar.gz u-boot-imx-07cc0999413481568b38b8d0e5f3d7514d9540b0.tar.bz2 | |
Major upate of JFFS2 code; now in sync with snapshot of MTD CVS of
March 13, 2005); new configuration options CONFIG_JFFS2_LZO and
CONFIG_JFFS2_LZARI are added. Both are undefined by default.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/NC650.h | 6 | ||||
| -rw-r--r-- | include/configs/PPChameleonEVB.h | 2 | ||||
| -rw-r--r-- | include/jffs2/jffs2.h | 24 |
3 files changed, 24 insertions, 8 deletions
diff --git a/include/configs/NC650.h b/include/configs/NC650.h index 3c976bb..3acdd77 100644 --- a/include/configs/NC650.h +++ b/include/configs/NC650.h @@ -122,6 +122,7 @@ CFG_CMD_DHCP | \ CFG_CMD_I2C | \ CFG_CMD_NAND | \ + CFG_CMD_JFFS2 | \ CFG_CMD_NFS | \ CFG_CMD_SNTP ) @@ -398,5 +399,10 @@ #define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */ #define BOOTFLAG_WARM 0x02 /* Software reboot */ +#define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */ +#define CONFIG_JFFS2_NAND_DEV 0 /* nand device jffs2 lives on */ +#define CONFIG_JFFS2_NAND_OFF 0 /* start of jffs2 partition */ +#define CONFIG_JFFS2_NAND_SIZE 4*1024*1024 /* size of jffs2 partition */ +#define NAND_CACHE_PAGES 16 /* size of nand cache in 512 bytes pages */ #endif /* __CONFIG_H */ diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h index 98af125..011abf1 100644 --- a/include/configs/PPChameleonEVB.h +++ b/include/configs/PPChameleonEVB.h @@ -772,7 +772,7 @@ #define CONFIG_JFFS2_NAND 1 /* jffs2 on nand support */ #define CONFIG_JFFS2_NAND_DEV 0 /* nand device jffs2 lives on */ #define CONFIG_JFFS2_NAND_OFF 0 /* start of jffs2 partition */ -#define CONFIG_JFFS2_NAND_SIZE 2*1024*1024 /* size of jffs2 partition */ +#define CONFIG_JFFS2_NAND_SIZE 4*1024*1024 /* size of jffs2 partition */ #define NAND_CACHE_PAGES 16 /* size of nand cache in 512 bytes pages */ #endif /* __CONFIG_H */ diff --git a/include/jffs2/jffs2.h b/include/jffs2/jffs2.h index dee43a6..2fec488 100644 --- a/include/jffs2/jffs2.h +++ b/include/jffs2/jffs2.h @@ -65,7 +65,9 @@ #define JFFS2_COMPR_COPY 0x04 #define JFFS2_COMPR_DYNRUBIN 0x05 #define JFFS2_COMPR_ZLIB 0x06 -#define JFFS2_NUM_COMPR 7 +#define JFFS2_COMPR_LZO 0x07 +#define JFFS2_COMPR_LZARI 0x08 +#define JFFS2_NUM_COMPR 9 /* Compatibility flags. */ #define JFFS2_COMPAT_MASK 0xc000 /* What do to if an unknown nodetype is found */ @@ -193,14 +195,22 @@ u32 jffs2_1pass_ls(struct part_info *part,const char *fname); u32 jffs2_1pass_load(char *dest, struct part_info *part,const char *fname); u32 jffs2_1pass_info(struct part_info *part); -void rtime_decompress(unsigned char *data_in, unsigned char *cpage_out, u32 - srclen, u32 destlen); -void rubin_do_decompress(unsigned char *bits, unsigned char *in, unsigned char - *page_out, __u32 destlen); +void rtime_decompress(unsigned char *data_in, unsigned char *cpage_out, + u32 srclen, u32 destlen); +void rubin_do_decompress(unsigned char *bits, unsigned char *in, + unsigned char *page_out, __u32 destlen); void dynrubin_decompress(unsigned char *data_in, unsigned char *cpage_out, - unsigned long sourcelen, unsigned long dstlen); + unsigned long sourcelen, unsigned long dstlen); long zlib_decompress(unsigned char *data_in, unsigned char *cpage_out, - __u32 srclen, __u32 destlen); + __u32 srclen, __u32 destlen); +#if defined(CONFIG_JFFS2_LZARI) +int lzari_decompress(unsigned char *data_in, unsigned char *cpage_out, + u32 srclen, u32 destlen); +#endif +#if defined(CONFIG_JFFS2_LZO) +int lzo_decompress(unsigned char *data_in, unsigned char *cpage_out, + u32 srclen, u32 destlen); +#endif char *mkmodestr(unsigned long mode, char *str); #endif /* __LINUX_JFFS2_H__ */ |