summaryrefslogtreecommitdiff
path: root/common/cmd_nand.c
diff options
context:
space:
mode:
authorPeter Pearse <peter.pearse@arm.com>2007-09-18 11:12:58 +0100
committerPeter Pearse <peter.pearse@arm.com>2007-09-18 11:12:58 +0100
commitafd477b227c089f2b7ce0aadb20b9ea7dc6ee6f8 (patch)
tree4b0d37a727b3ede6540825258cc930533c0cdce7 /common/cmd_nand.c
parentd94c79e47011af5e8dd10ed6163c09b4cfc743cc (diff)
parent67c31036acaaaa992fc346cc89db0909a7e733c4 (diff)
downloadu-boot-afd477b227c089f2b7ce0aadb20b9ea7dc6ee6f8.tar.gz
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'common/cmd_nand.c')
-rw-r--r--common/cmd_nand.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 254a7755fc..1fdd7a67f6 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -161,7 +161,11 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
ulong addr, off, size;
char *cmd, *s;
nand_info_t *nand;
+#ifdef CFG_NAND_QUIET
+ int quiet = CFG_NAND_QUIET;
+#else
int quiet = 0;
+#endif
const char *quiet_str = getenv("quiet");
/* at least two arguments please */
@@ -452,7 +456,7 @@ U_BOOT_CMD(nand, 5, 1, do_nand,
"info - show available NAND devices\n"
"nand device [dev] - show or set current device\n"
"nand read[.jffs2] - addr off|partition size\n"
- "nand write[.jffs2] - addr off|partiton size - read/write `size' bytes starting\n"
+ "nand write[.jffs2] - addr off|partition size - read/write `size' bytes starting\n"
" at offset `off' to/from memory address `addr'\n"
"nand erase [clean] [off size] - erase `size' bytes from\n"
" offset `off' (entire device if not specified)\n"