projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove superfluous preprocessor tests from some cmd_*.c files.
[oweals/u-boot.git]
/
lib_generic
/
crc32.c
diff --git
a/lib_generic/crc32.c
b/lib_generic/crc32.c
index 64f66ed6fb176b08b23132927b2e64ade5208145..b27048ceebf2f07075457aedc5f1b0a3cb6db381 100644
(file)
--- a/
lib_generic/crc32.c
+++ b/
lib_generic/crc32.c
@@
-14,8
+14,10
@@
#include <stdint.h>
#endif
#include <stdint.h>
#endif
+#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
#include <watchdog.h>
#include <watchdog.h>
-#include "zlib.h"
+#endif
+#include "u-boot/zlib.h"
#define local static
#define ZEXPORT /* empty */
#define local static
#define ZEXPORT /* empty */
@@
-170,9
+172,7
@@
uint32_t ZEXPORT crc32 (uint32_t crc, const Bytef *buf, uInt len)
return crc ^ 0xffffffffL;
}
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.
/* No ones complement version. JFFS2 (and other things ?)
* don't use ones compliment in their CRC calculations.