diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2007-09-24 14:43:43 -0500 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2007-09-24 14:43:43 -0500 |
| commit | 8ffc774993725a0646aa8d1995d968c95aee9e3c (patch) | |
| tree | ee69b8872cf8c295a48244280c82d98e191111ab /common/cmd_nand.c | |
| parent | d7fee32b7e61fe11c64e371cde79faa4768e8350 (diff) | |
| parent | 66dcad3a9a53e0766d90e0084123bd8529522fb0 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'common/cmd_nand.c')
| -rw-r--r-- | common/cmd_nand.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 254a7755fcf..1fdd7a67f60 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" |