several fixes to ifxmips, getting ready for dsl driver merge

[openwrt.git] / tools / mkimage / src / crc32.c

diff --git a/tools/mkimage/src/crc32.c b/tools/mkimage/src/crc32.c
index 9294fcb..067b310 100644 (file)
--- a/tools/mkimage/src/crc32.c
+++ b/tools/mkimage/src/crc32.c
@@ -7,7 +7,9 @@
  * Copyright (C) 1995-1998 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
  * Copyright (C) 1995-1998 Mark Adler
  * For conditions of distribution and use, see copyright notice in zlib.h
  */

+

 #define USE_HOSTCC
 #define USE_HOSTCC

+

 #ifndef USE_HOSTCC     /* Shut down "ANSI does not permit..." warnings */
 #include <common.h>    /* to get command definitions like CFG_CMD_JFFS2 */
 #endif
 #ifndef USE_HOSTCC     /* Shut down "ANSI does not permit..." warnings */
 #include <common.h>    /* to get command definitions like CFG_CMD_JFFS2 */
 #endif


@@ -171,7 +173,8 @@ uLong ZEXPORT crc32(crc, buf, len)
     return crc ^ 0xffffffffL;
 }
 
     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.
 
 /* No ones complement version. JFFS2 (and other things ?)
  * don't use ones compliment in their CRC calculations.