diff options
| author | Stefan Roese <sr@denx.de> | 2006-10-11 16:57:01 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2006-10-11 17:04:11 +0200 |
| commit | 752d6837c3ea93e9e1c51165886b1aa77b144745 (patch) | |
| tree | d19967433e39d10b3acfd28fa61f05a7d65c4ec7 | |
| parent | 2255b2d2044d434463eb2661e18018e50f1643d9 (diff) | |
| download | u-boot-imx-752d6837c3ea93e9e1c51165886b1aa77b144745.zip u-boot-imx-752d6837c3ea93e9e1c51165886b1aa77b144745.tar.gz u-boot-imx-752d6837c3ea93e9e1c51165886b1aa77b144745.tar.bz2 | |
Cleanup of NAND update patch (remove changelog from cmd_nand.c)
Patch by Guido Classen, 10 Oct 2006
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | common/cmd_nand.c | 1 | ||||
| -rw-r--r-- | lib_generic/crc32.c | 5 |
3 files changed, 5 insertions, 4 deletions
@@ -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 274ef0b..fdbe7c7 100644 --- 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 8283413..3db224a 100644 --- 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. |