Cleanup of NAND update patch (remove changelog from cmd_nand.c)

Patch by Guido Classen, 10 Oct 2006

diff --git a/CHANGELOG b/CHANGELOG
index 9ed65bdbfe435ec3e870957bc343ea55ac7ba4b7..98b3324eb9422c07cdf3112d48643d361818a7f2 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Cleanup of NAND update patch (remove changelog from cmd_nand.c)
+  Patch by Guido Classen, 10 Oct 2006
+
 * Several improvements to the new NAND subsystem:
   - JFFS2 related commands implemented in mtd-utils style
   - Support for bad blocks

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 274ef0b99383f05241ad6b091b575640d0ab8c4e..fdbe7c78a63a6e574e7ff778a04e2bc99f896ccc 100644 (file)
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -341,7 +341,6 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
                return ret == 0 ? 0 : 1;
        }
 
-       /* 2006-09-28 gc: implement missing commands */
        if (strcmp(cmd, "markbad") == 0) {
                addr = (ulong)simple_strtoul(argv[2], NULL, 16);
 

diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c
index 828341350226e2bf68535e597fdb0055677db693..3db224a3649981bec3b5705014ed5467bd51c26f 100644 (file)
--- a/lib_generic/crc32.c
+++ b/lib_generic/crc32.c
@@ -171,9 +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.