From 2d927fbd7bbfd6d03280757d447991a60c690c6e Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Wed, 4 Jan 2012 00:48:27 +0000 Subject: 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 Acked-by: Stefan Tauner --- flashrom.8 | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) (limited to 'flashrom.8') diff --git a/flashrom.8 b/flashrom.8 index 66cde4f..6b25b43 100644 --- a/flashrom.8 +++ b/flashrom.8 @@ -5,7 +5,7 @@ flashrom \- detect, read, write, verify and erase flash chips .B flashrom \fR[\fB\-n\fR] [\fB\-V\fR] [\fB\-f\fR] [\fB\-h\fR|\fB\-R\fR|\ \fB\-L\fR|\fB\-z\fR|\fB\-E\fR|\fB\-r\fR |\fB\-w\fR |\ \fB\-v\fR ] - [\fB\-c\fR ] [\fB\-m\fR [:]] \ + [\fB\-c\fR ] \ [\fB\-l\fR ] [\fB\-i\fR ] [\fB\-p\fR [:]] .SH DESCRIPTION @@ -88,19 +88,6 @@ printed by without the vendor name as parameter. Please note that the chip name is case sensitive. .TP -.B "\-m, \-\-mainboard" [:] -Override mainboard settings. -.sp -flashrom reads the coreboot table to determine the current mainboard. If no -coreboot table could be read or if you want to override these values, you can -specify \-m, e.g.: -.sp -.B " flashrom \-\-mainboard AGAMI:ARUMA \-w agami_aruma.rom" -.sp -See the 'Known boards' or 'Known laptops' section in the output -of 'flashrom \-L' for a list of boards which require the specification of -the board name, if no coreboot table is found. -.TP .B "\-f, \-\-force" Force one or more of the following actions: .sp @@ -245,10 +232,15 @@ autodetected using one of the following mechanisms: If your system is running coreboot, the mainboard type is determined from the coreboot table. Otherwise, the mainboard is detected by examining the onboard PCI devices and possibly DMI info. If PCI and DMI do not contain information to uniquely -identify the mainboard (which is the exception), it might be necessary to -specify the mainboard using the -.B \-m -switch (see above). +identify the mainboard (which is the exception), or if you want to override +the detected mainboard model, you can specify the mainboard using the +.sp +.B " flashrom \-p internal:mainboard=[:]" +syntax. +.sp +See the 'Known boards' or 'Known laptops' section in the output +of 'flashrom \-L' for a list of boards which require the specification of +the board name, if no coreboot table is found. .sp Some of these board-specific flash enabling functions (called .BR "board enables" ) -- cgit v1.1