sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

Merge with /home/wd/git/u-boot/master

This commit is contained in:
Wolfgang Denk 2006-10-12 01:26:20 +02:00
parent 7e2a24dca9 ea237a4d25
commit 34a7ceeff4
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -2,6 +2,9 @@
Changes since U-Boot 1.1.4: 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: * Several improvements to the new NAND subsystem:
- JFFS2 related commands implemented in mtd-utils style - JFFS2 related commands implemented in mtd-utils style
- Support for bad blocks - Support for bad blocks

1
common/cmd_nand.c
View File

@ -341,7 +341,6 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
return ret == 0 ? 0 : 1; return ret == 0 ? 0 : 1;
} }
/* 2006-09-28 gc: implement missing commands */
if (strcmp(cmd, "markbad") == 0) { if (strcmp(cmd, "markbad") == 0) {
addr = (ulong)simple_strtoul(argv[2], NULL, 16); addr = (ulong)simple_strtoul(argv[2], NULL, 16);

5
lib_generic/crc32.c
View File

@ -171,9 +171,8 @@ uLong ZEXPORT crc32(crc, buf, len)
return crc ^ 0xffffffffL; return crc ^ 0xffffffffL;
} }
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) \ #if ((CONFIG_COMMANDS & CFG_CMD_JFFS2) || (CONFIG_COMMANDS & CFG_CMD_NAND)) \
|| (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY) && !defined(CFG_NAND_LEGACY)
/* No ones complement version. JFFS2 (and other things ?) /* No ones complement version. JFFS2 (and other things ?)
* don't use ones compliment in their CRC calculations. * don't use ones compliment in their CRC calculations.

2
net/bootp.c
View File

@ -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_ciaddr, &bp_offer->bp_ciaddr); /* both in network byte order */
NetCopyIP(&bp->bp_yiaddr, &bp_offer->bp_yiaddr); NetCopyIP(&bp->bp_yiaddr, &bp_offer->bp_yiaddr);
NetCopyIP(&bp->bp_siaddr, &bp_offer->bp_siaddr); NetCopyIP(&bp->bp_siaddr, &bp_offer->bp_siaddr);
/* /*
* RFC3046 requires Relay Agents to discard packets with * RFC3046 requires Relay Agents to discard packets with
* nonzero and offered giaddr * nonzero and offered giaddr
*/ */