Change in flashrom[master]: cli_classic: Rename --fmap to --fmap-file

[David Hendricks (Code Review)]

David Hendricks has uploaded this change for review. ( https://review.coreboot.org/27554

Change subject: cli_classic: Rename --fmap to --fmap-file
......................................................................

cli_classic: Rename --fmap to --fmap-file

This makes the option explicit about using a file, while --fmap will
be repurposed to read the fmap from ROM without taking an argument.

(This patch should probably be squashed into the previous one)

Change-Id: I31e010ea99475964decfe878724000b555b6372d
Signed-off-by: David Hendricks 
---
M cli_classic.c
1 file changed, 5 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/54/27554/1

diff --git a/cli_classic.c b/cli_classic.c
index 4b1999f..1b74ed5 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -109,7 +109,7 @@
    enum programmer prog = PROGRAMMER_INVALID;
    enum {
    	OPTION_IFD = 0x0100,
-		OPTION_FMAP = 0x0101,
+		OPTION_FMAP_FILE,
    	OPTION_FLASH_CONTENTS,
    };
    int ret = 0;
@@ -127,7 +127,7 @@
    	{"force",		0, NULL, 'f'},
    	{"layout",		1, NULL, 'l'},
    	{"ifd",			0, NULL, OPTION_IFD},
-		{"fmap",		1, NULL, OPTION_FMAP},
+		{"fmap-file",		1, NULL, OPTION_FMAP_FILE},
    	{"image",		1, NULL, 'i'},
    	{"flash-contents",	1, NULL, OPTION_FLASH_CONTENTS},
    	{"list-supported",	0, NULL, 'L'},
@@ -244,14 +244,14 @@
    		}
    		ifd = 1;
    		break;
-		case OPTION_FMAP:
+		case OPTION_FMAP_FILE:
    		if (fmapfile) {
-				fprintf(stderr, "Error: --fmap specified "
+				fprintf(stderr, "Error: --fmap-file specified "
    				"more than once. Aborting.\n");
    			cli_classic_abort_usage();
    		}
    		if (ifd) {
-				fprintf(stderr, "Error: --fmap and --ifd both specified. Aborting.\n");
+				fprintf(stderr, "Error: --fmap-file and --ifd both specified. Aborting.\n");
    			cli_classic_abort_usage();
    		}
    		fmapfile = strdup(optarg);