diff options
| author | Wolfgang Denk <wd@nyx.denx.de> | 2006-10-11 14:15:21 +0200 | 
|---|---|---|
| committer | Wolfgang Denk <wd@nyx.denx.de> | 2006-10-11 14:15:21 +0200 | 
| commit | fb883a521e04437acfe989de3e152b2e4866856b (patch) | |
| tree | 0cf61f45ae693082b24ced9c1da9a87bdd0cabbd /lib_generic/crc32.c | |
| parent | 4a39616da41840bbc5b4c3f69df9861c2e6a8425 (diff) | |
| parent | 2255b2d2044d434463eb2661e18018e50f1643d9 (diff) | |
| download | olio-uboot-2014.01-fb883a521e04437acfe989de3e152b2e4866856b.tar.xz olio-uboot-2014.01-fb883a521e04437acfe989de3e152b2e4866856b.zip | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'lib_generic/crc32.c')
| -rw-r--r-- | lib_generic/crc32.c | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index 50ca4ffd3..828341350 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -171,7 +171,9 @@ uLong ZEXPORT crc32(crc, buf, len)      return crc ^ 0xffffffffL;  } -#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) +#if (CONFIG_COMMANDS & CFG_CMD_JFFS2)					\ +	|| (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY) +  /* No ones complement version. JFFS2 (and other things ?)   * don't use ones compliment in their CRC calculations. |