summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2009-06-24 08:18:38 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2009-06-24 08:18:38 +0000
commit5d1f41857b36fb8632f5d88314e40edd4abc94ef (patch)
tree6d3acf6050c32c7554378f78611d0ff51f188c39
parentdd2e14c61c5631ff609de3ae1f2b5a22679e2b2b (diff)
downloadast2050-flashrom-5d1f41857b36fb8632f5d88314e40edd4abc94ef.zip
ast2050-flashrom-5d1f41857b36fb8632f5d88314e40edd4abc94ef.tar.gz
Remove duplicated [file] from usage help
A file is already specified directly in conjunction for -r/-w/-v. Corresponding to flashrom svn r628. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
-rw-r--r--flashrom.82
-rw-r--r--flashrom.c7
2 files changed, 4 insertions, 5 deletions
diff --git a/flashrom.8 b/flashrom.8
index d51034e..423ee29 100644
--- a/flashrom.8
+++ b/flashrom.8
@@ -4,7 +4,7 @@ flashrom \- detect, read, write, verify and erase flash chips
.SH SYNOPSIS
.B flashrom \fR[\fB\-VfLzhR\fR] [\fB\-E\fR|\fB\-r\fR file|\fB\-w\fR file|\fB\-v\fR file]
[\fB\-c\fR chipname] [\fB\-m\fR [vendor:]part]
- [\fB\-l\fR file] [\fB\-i\fR image] [\fB\-p\fR programmer] [file]
+ [\fB\-l\fR file] [\fB\-i\fR image] [\fB\-p\fR programmer]
.SH DESCRIPTION
.B flashrom
is a utility for detecting, reading, writing, verifying and erasing flash
diff --git a/flashrom.c b/flashrom.c
index 914ee4b..e5e4994 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -493,7 +493,7 @@ int erase_flash(struct flashchip *flash)
void usage(const char *name)
{
printf("usage: %s [-VfLzhR] [-E|-r file|-w file|-v file] [-c chipname]\n"
- " [-m [vendor:]part] [-l file] [-i image] [-p programmer] [file]\n\n", name);
+ " [-m [vendor:]part] [-l file] [-i image] [-p programmer]\n\n", name);
printf("Please note that the command line interface for flashrom will "
"change before\nflashrom 1.0. Do not use flashrom in scripts "
@@ -518,9 +518,8 @@ void usage(const char *name)
" it87spi, ft2232spi, serprog)\n"
" -h | --help: print this help text\n"
" -R | --version: print the version (release)\n"
- "\nYou can specify one of -E, -r, -w, -v or no operation. "
- "If no operation is\nspecified, then all that happens"
- " is that flash info is dumped.\n\n");
+ "\nYou can specify one of -E, -r, -w, -v or no operation. If no operation is\n"
+ "specified, then all that happens is that flash info is dumped.\n\n");
exit(1);
}
OpenPOWER on IntegriCloud