From 201bde33d0ee8df9038d15e662f345b2051e60be Mon Sep 17 00:00:00 2001 From: Bernhard Walle Date: Mon, 21 Jan 2008 15:24:22 +0000 Subject: This patch adds version information Because 'v' and 'V' are already in use, the patch uses 'R' (for release) and, of course, '--version'. Corresponding to flashrom svn r182 and coreboot v2 svn r3067. Signed-off-by: Bernhard Walle Acked-by: Ulf Jordan Acked-by: Uwe Hermann --- flashrom.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'flashrom.c') diff --git a/flashrom.c b/flashrom.c index 9fde57d9..5446fc5f 100644 --- a/flashrom.c +++ b/flashrom.c @@ -191,7 +191,7 @@ int verify_flash(struct flashchip *flash, uint8_t *buf) void usage(const char *name) { - printf("usage: %s [-rwvEVfh] [-c chipname] [-s exclude_start]\n", name); + printf("usage: %s [-rwvEVfhR] [-c chipname] [-s exclude_start]\n", name); printf(" [-e exclude_end] [-m vendor:part] [-l file.layout] [-i imagename] [file]\n"); printf (" -r | --read: read flash and save into file\n" @@ -206,11 +206,17 @@ void usage(const char *name) " -f | --force: force write without checking image\n" " -l | --layout : read rom layout from file\n" " -i | --image : only flash image name from flash layout\n" + " -R | --version: print the version (release)\n" "\n" " If no file is specified, then all that happens" " is that flash info is dumped.\n\n"); exit(1); } +void print_version(void) +{ + printf("flashrom r%s\n", FLASHROM_VERSION); +} + int main(int argc, char *argv[]) { uint8_t *buf; @@ -236,6 +242,7 @@ int main(int argc, char *argv[]) {"layout", 1, 0, 'l'}, {"image", 1, 0, 'i'}, {"help", 0, 0, 'h'}, + {"version", 0, 0, 'R'}, {0, 0, 0, 0} }; @@ -253,7 +260,7 @@ int main(int argc, char *argv[]) } setbuf(stdout, NULL); - while ((opt = getopt_long(argc, argv, "rwvVEfc:s:e:m:l:i:h", + while ((opt = getopt_long(argc, argv, "rRwvVEfc:s:e:m:l:i:h", long_options, &option_index)) != EOF) { switch (opt) { case 'r': @@ -306,6 +313,10 @@ int main(int argc, char *argv[]) tempstr = strdup(optarg); find_romentry(tempstr); break; + case 'R': + print_version(); + exit(0); + break; case 'h': default: usage(argv[0]); -- cgit v1.2.3