Merge branch 'master' of http://www.denx.de/git/u-boot
diff --git a/CHANGELOG b/CHANGELOG
index 9ed65bd..166cfa3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,14 @@
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:
- 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..7042a9c 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -251,7 +251,7 @@
"Use this command only for testing purposes "
"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"
);
@@ -341,7 +341,6 @@
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/drivers/nand/nand_util.c b/drivers/nand/nand_util.c
index 5a8e58a..7570210 100644
--- a/drivers/nand/nand_util.c
+++ b/drivers/nand/nand_util.c
@@ -170,9 +170,9 @@
if (ret > 0) {
if (!opts->quiet)
printf("\rSkipping bad block at "
- "0x%08x "
- " \n",
- erase.addr);
+ "0x%08x "
+ " \n",
+ erase.addr);
continue;
} else if (ret < 0) {
diff --git a/lib_generic/crc32.c b/lib_generic/crc32.c
index 8283413..3d99b69 100644
--- a/lib_generic/crc32.c
+++ b/lib_generic/crc32.c
@@ -171,9 +171,8 @@
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 @@
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
*/