From 752d6837c3ea93e9e1c51165886b1aa77b144745 Mon Sep 17 00:00:00 2001
From: Stefan Roese
Date: Wed, 11 Oct 2006 16:57:01 +0200
Subject: Cleanup of NAND update patch (remove changelog from cmd_nand.c) Patch
 by Guido Classen, 10 Oct 2006

---
 common/cmd_nand.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'common')

diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 274ef0b9938..fdbe7c78a63 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);
 
-- 
cgit v1.2.3


From 87621bc24789e024c62a8a12bebd592943cdfb02 Mon Sep 17 00:00:00 2001
From: Wolfgang Denk
Date: Thu, 12 Oct 2006 11:43:47 +0200
Subject: Fix spelling; minor code cleanup.

---
 CHANGELOG                | 2 ++
 common/cmd_nand.c        | 2 +-
 drivers/nand/nand_util.c | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'common')

diff --git a/CHANGELOG b/CHANGELOG
index 68aa65ae3c3..166cfa3a4ed 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 fdbe7c78a63..7042a9c2266 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 5a8e58a741c..7570210d5ca 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) {
-- 
cgit v1.2.3