Merge branch 'master' of git://git.denx.de/u-boot-arm

[platform/kernel/u-boot.git] / lib_generic / crc32.c

diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c
index 73070de..b27048c 100644 (file)
--- a/lib_generic/crc32.c
+++ b/lib_generic/crc32.c
@@ -13,9 +13,11 @@
 #else
 #include <stdint.h>
 #endif
-#include <watchdog.h>
 
-#include "zlib.h"
+#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
+#include <watchdog.h>
+#endif
+#include "u-boot/zlib.h"
 
 #define local static
 #define ZEXPORT        /* empty */
@@ -54,7 +56,7 @@ local void make_crc_table()
 {
   uint32_t c;
   int n, k;
-  uLong poly;            /* polynomial exclusive-or pattern */
+  uLong poly;          /* polynomial exclusive-or pattern */
   /* terms of polynomial defining this crc (except x^32): */
   static const Byte p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
 
@@ -170,9 +172,7 @@ uint32_t ZEXPORT crc32 (uint32_t crc, const Bytef *buf, uInt len)
     return crc ^ 0xffffffffL;
 }
 
-#if defined(CONFIG_CMD_JFFS2) || \
-       (defined(CONFIG_CMD_NAND) \
-       && !defined(CFG_NAND_LEGACY))
+#if defined(CONFIG_CMD_JFFS2) || defined(CONFIG_CMD_NAND)
 
 /* No ones complement version. JFFS2 (and other things ?)
  * don't use ones compliment in their CRC calculations.
@@ -220,7 +220,7 @@ uint32_t ZEXPORT crc32_wd (uint32_t crc,
                WATCHDOG_RESET ();
        }
 #else
-        crc = crc32 (crc, buf, len);
+       crc = crc32 (crc, buf, len);
 #endif
 
        return crc;