diff options
author | Jon Loeliger <jdl@freescale.com> | 2006-10-12 11:29:33 -0500 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2006-10-12 11:29:33 -0500 |
commit | f7b190d3120611d9d47c3ea784c10f5f713655f5 (patch) | |
tree | 7b2ebba6cde3c4fd4e024516296d63f214ff9464 /common | |
parent | 0ee90cb77e01d6e8ccd37e1bd96678597875c391 (diff) | |
parent | 87621bc24789e024c62a8a12bebd592943cdfb02 (diff) | |
download | u-boot-imx-f7b190d3120611d9d47c3ea784c10f5f713655f5.zip u-boot-imx-f7b190d3120611d9d47c3ea784c10f5f713655f5.tar.gz u-boot-imx-f7b190d3120611d9d47c3ea784c10f5f713655f5.tar.bz2 |
Merge branch 'master' of http://www.denx.de/git/u-boot
Diffstat (limited to 'common')
-rw-r--r-- | common/cmd_nand.c | 3 |
1 files changed, 1 insertions, 2 deletions
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 @@ 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" ); @@ -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); |