Merge branch 'master' of http://www.denx.de/git/u-boot
This commit is contained in:
commit
f7b190d312
|
@ -2,6 +2,14 @@
|
||||||
Changes since U-Boot 1.1.4:
|
Changes since U-Boot 1.1.4:
|
||||||
======================================================================
|
======================================================================
|
||||||
|
|
||||||
|
* Fix spelling; minor code cleanup.
|
||||||
|
|
||||||
|
* 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
|
||||||
|
|
||||||
* 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
|
||||||
|
|
|
@ -251,7 +251,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||||
"Use this command only for testing purposes "
|
"Use this command only for testing purposes "
|
||||||
"if you\n"
|
"if you\n"
|
||||||
" "
|
" "
|
||||||
"are shure of what you are doing!\n"
|
"are sure of what you are doing!\n"
|
||||||
"\nReally scrub this NAND flash? <y/N>\n"
|
"\nReally scrub this NAND flash? <y/N>\n"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -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);
|
||||||
|
|
||||||
|
|
|
@ -170,9 +170,9 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
|
||||||
if (ret > 0) {
|
if (ret > 0) {
|
||||||
if (!opts->quiet)
|
if (!opts->quiet)
|
||||||
printf("\rSkipping bad block at "
|
printf("\rSkipping bad block at "
|
||||||
"0x%08x "
|
"0x%08x "
|
||||||
" \n",
|
" \n",
|
||||||
erase.addr);
|
erase.addr);
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
} else if (ret < 0) {
|
} else if (ret < 0) {
|
||||||
|
|
|
@ -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) && !defined(CFG_NAND_LEGACY)
|
((CONFIG_COMMANDS & CFG_CMD_NAND) && !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.
|
||||||
|
|
|
@ -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
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue