summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2006-10-12 11:43:47 +0200
committerWolfgang Denk <wd@pollux.denx.de>2006-10-12 11:43:47 +0200
commit87621bc24789e024c62a8a12bebd592943cdfb02 (patch)
treedca34a296feafcf7e5144d04d08291fd4a245f8d
parent5c34eee94dfafab27d7d76aa5457458672f7544c (diff)
downloadblackbird-obmc-uboot-87621bc24789e024c62a8a12bebd592943cdfb02.tar.gz
blackbird-obmc-uboot-87621bc24789e024c62a8a12bebd592943cdfb02.zip
Fix spelling; minor code cleanup.
-rw-r--r--CHANGELOG2
-rw-r--r--common/cmd_nand.c2
-rw-r--r--drivers/nand/nand_util.c6
3 files changed, 6 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 68aa65ae3c..166cfa3a4e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
Changes since U-Boot 1.1.4:
======================================================================
+* Fix spelling; minor code cleanup.
+
* Fix JFFS2 compilation problem
Patch by Stefan Roese, 12 Oct 2006
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index fdbe7c78a6..7042a9c226 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -251,7 +251,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
"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"
);
diff --git a/drivers/nand/nand_util.c b/drivers/nand/nand_util.c
index 5a8e58a741..7570210d5c 100644
--- a/drivers/nand/nand_util.c
+++ b/drivers/nand/nand_util.c
@@ -170,9 +170,9 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts)
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) {
OpenPOWER on IntegriCloud