diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-12 01:26:20 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-12 01:26:20 +0200 |
| commit | 34a7ceeff449be015a37d0e3f3178ca313618349 (patch) | |
| tree | dda85b95dfa92302c7abf3f7243c79b19f089549 | |
| parent | 7e2a24dca9a3213f0b4941562e4387e20bec3e2d (diff) | |
| parent | ea237a4d258f269785e984ad031f752536b4eedf (diff) | |
| download | u-boot-imx-34a7ceeff449be015a37d0e3f3178ca313618349.zip u-boot-imx-34a7ceeff449be015a37d0e3f3178ca313618349.tar.gz u-boot-imx-34a7ceeff449be015a37d0e3f3178ca313618349.tar.bz2 | |
Merge with /home/wd/git/u-boot/master
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | common/cmd_nand.c | 1 | ||||
| -rw-r--r-- | lib_generic/crc32.c | 5 | ||||
| -rw-r--r-- | net/bootp.c | 2 |
4 files changed, 6 insertions, 5 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. diff --git a/net/bootp.c b/net/bootp.c index 8f1382e..1de9a8f 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -851,7 +851,7 @@ static void DhcpSendRequestPkt(Bootp_t *bp_offer) NetCopyIP(&bp->bp_ciaddr, &bp_offer->bp_ciaddr); /* both in network byte order */ NetCopyIP(&bp->bp_yiaddr, &bp_offer->bp_yiaddr); NetCopyIP(&bp->bp_siaddr, &bp_offer->bp_siaddr); - /* + /* * RFC3046 requires Relay Agents to discard packets with * nonzero and offered giaddr */ |