From 5c34eee94dfafab27d7d76aa5457458672f7544c Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Thu, 12 Oct 2006 07:04:24 +0200 Subject: Fix JFFS2 compilation problem Patch by Stefan Roese, 12 Oct 2006 --- CHANGELOG | 3 +++ lib_generic/crc32.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 98b3324eb9..68aa65ae3c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,9 @@ Changes since U-Boot 1.1.4: ====================================================================== +* Fix JFFS2 compilation problem + Patch by Stefan Roese, 12 Oct 2006 + * Cleanup of NAND update patch (remove changelog from cmd_nand.c) Patch by Guido Classen, 10 Oct 2006 diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c index 3db224a364..3d99b69296 100644 --- a/lib_generic/crc32.c +++ b/lib_generic/crc32.c @@ -171,8 +171,8 @@ uLong ZEXPORT crc32(crc, buf, len) return crc ^ 0xffffffffL; } -#if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || (CONFIG_COMMANDS & CFG_CMD_NAND)) \ - && !defined(CFG_NAND_LEGACY) +#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. -- cgit v1.2.1