Replace --mainboard with -p internal:mainboard
NOTE:
The --list-supported-wiki output changed to use -p internal:mainboard=
instead of -m
The --list-supported output changed the heading of the mainboard list
from
Vendor Board Status Required option
to
Vendor Board Status Required value for
-p internal:mainboard=
Fix lb_vendor_dev_from_string() not to write to the supplied string.
Corresponding to flashrom svn r1483.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
diff --git a/cli_classic.c b/cli_classic.c
index 3928ded..7ce74e5 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -106,7 +106,7 @@
"-z|"
#endif
"-E|-r <file>|-w <file>|-v <file>]\n"
- " [-c <chipname>] [-m [<vendor>:]<part>] [-l <file>]\n"
+ " [-c <chipname>] [-l <file>]\n"
" [-i <image>] [-p <programmername>[:<parameters>]]\n\n");
printf("Please note that the command line interface for flashrom has "
@@ -128,11 +128,6 @@
" -V | --verbose more verbose output\n"
" -c | --chip <chipname> probe only for specified "
"flash chip\n"
-#if CONFIG_INTERNAL == 1
- /* FIXME: --mainboard should be a programmer parameter */
- " -m | --mainboard <[vendor:]part> override mainboard "
- "detection\n"
-#endif
" -f | --force force specific operations "
"(see man page)\n"
" -n | --noverify don't auto-verify\n"
@@ -190,7 +185,6 @@
{"verify", 1, NULL, 'v'},
{"noverify", 0, NULL, 'n'},
{"chip", 1, NULL, 'c'},
- {"mainboard", 1, NULL, 'm'},
{"verbose", 0, NULL, 'V'},
{"force", 0, NULL, 'f'},
{"layout", 1, NULL, 'l'},
@@ -275,17 +269,6 @@
}
erase_it = 1;
break;
- case 'm':
-#if CONFIG_INTERNAL == 1
- tempstr = strdup(optarg);
- lb_vendor_dev_from_string(tempstr);
-#else
- fprintf(stderr, "Error: Internal programmer support "
- "was not compiled in and --mainboard only\n"
- "applies to the internal programmer. Aborting.\n");
- cli_classic_abort_usage();
-#endif
- break;
case 'f':
force = 1;
break;
@@ -426,14 +409,6 @@
if (prog == PROGRAMMER_INVALID)
prog = default_programmer;
-#if CONFIG_INTERNAL == 1
- if ((prog != PROGRAMMER_INTERNAL) && (lb_part || lb_vendor)) {
- fprintf(stderr, "Error: --mainboard requires the internal "
- "programmer. Aborting.\n");
- cli_classic_abort_usage();
- }
-#endif
-
/* FIXME: Delay calibration should happen in programmer code. */
myusec_calibrate_delay();