Author: hailfinger
Date: Thu Oct  7 01:03:21 2010
New Revision: 1197
URL: http://flashrom.org/trac/flashrom/changeset/1197

Log:
Update the author list in the man page.
Update programmer parameter documentation.

Signed-off-by: Carl-Daniel Hailfinger <[email protected]>
Acked-by: Uwe Hermann <[email protected]>

Modified:
   trunk/flashrom.8
   trunk/pcidev.c

Modified: trunk/flashrom.8
==============================================================================
--- trunk/flashrom.8    Wed Oct  6 04:56:44 2010        (r1196)
+++ trunk/flashrom.8    Thu Oct  7 01:03:21 2010        (r1197)
@@ -97,7 +97,7 @@
 .sp
 * Force chip read and pretend the chip is there.
 .sp
-* Force chip access even if the chip is bigger than the maximum supported\
+* Force chip access even if the chip is bigger than the maximum supported \
 size for the flash bus.
 .sp
 * Force erase even if erase is known bad.
@@ -169,6 +169,9 @@
 .sp
 .BR "* nicsmc1211" " (for flash ROMs on RTL8139-compatible SMC2 network cards)"
 .sp
+.BR "* nicnatsemi" " (for flash ROMs on National Semiconductor DP838* network \
+cards)"
+.sp
 .BR "* gfxnvidia" " (for flash ROMs on NVIDIA graphics cards)"
 .sp
 .BR "* drkaiser" " (for flash ROMs on Dr. Kaiser PC-Waechter PCI cards)"
@@ -187,6 +190,8 @@
 .sp
 .BR "* buspirate_spi" " (for SPI flash ROMs attached to a Bus Pirate)"
 .sp
+.BR "* dediprog" " (for SPI flash ROMs attached to a Dediprog SF100)"
+.sp
 .BR "* rayer_spi" " (for SPI flash ROMs attached to a RayeR parport \
 based programmer)"
 .sp
@@ -313,8 +318,8 @@
 Example:
 .B "flashrom \-p dummy:bus=lpc+fwh"
 .TP
-.BR "nic3com" , " nicrealtek" , " nicsmc1211" , " gfxnvidia" , " satasii \
-" and " atahpt " programmers
+.BR "nic3com" , " nicrealtek" , " nicsmc1211" , " nicnatsemi" , " gfxnvidia\
+" , " satasii " and " atahpt " programmers
 These programmers have an option to specify the PCI address of the card
 your want to use, which must be specified if more than one card supported
 by the selected programmer is installed in your system. The syntax is
@@ -396,6 +401,9 @@
 .BR 30k ", " 125k ", " 250k ", " 1M ", " 2M ", " 2.6M ", " 4M ", " 8M
 (in Hz). The default is the maximum frequency of 8 MHz.
 .TP
+.BR "dediprog " programmer
+No parameters defined yet.
+.TP
 .BR "rayer_spi " programmer
 The default I/O base address used for the parallel port is 0x378 and you can 
use
 the optional
@@ -484,28 +492,48 @@
 .br
 Please see the individual files.
 .SH AUTHORS
+Andrew Morgan <[email protected]>
+.br
 Carl-Daniel Hailfinger
 .br
 Claus Gindhart <[email protected]>
 .br
+David Borg <[email protected]>
+.br
+David Hendricks <[email protected]>
+.br
 Dominik Geyer <[email protected]>
 .br
 Eric Biederman
 .br
 Giampiero Giancipoli <[email protected]>
 .br
+Helge Wagner <[email protected]>
+.br
+Idwer Vollering <[email protected]>
+.br
 Joe Bao <[email protected]>
 .br
+Jörg Fischer <[email protected]>
+.br
+Joshua Roys <[email protected]>
+.br
 Luc Verhaegen <[email protected]>
 .br
 Li-Ta Lo
 .br
 Markus Boas <[email protected]>
 .br
+Mattias Mattsson <[email protected]>
+.br
 Michael Karcher <[email protected]>
 .br
 Nikolay Petukhov <[email protected]>
 .br
+Patrick Georgi <[email protected]>
+.br
+Peter Lemenkov <[email protected]>
+.br
 Peter Stuge <[email protected]>
 .br
 Reinder E.N. de Haan <[email protected]>
@@ -520,6 +548,8 @@
 .br
 Stefan Wildemann <[email protected]>
 .br
+Stephan Guilloux <[email protected]>
+.br
 Steven James <[email protected]>
 .br
 Uwe Hermann <[email protected]>

Modified: trunk/pcidev.c
==============================================================================
--- trunk/pcidev.c      Wed Oct  6 04:56:44 2010        (r1196)
+++ trunk/pcidev.c      Thu Oct  7 01:03:21 2010        (r1197)
@@ -119,7 +119,7 @@
                exit(1);
        } else if (found > 1) {
                msg_perr("Error: Multiple supported PCI devices found. "
-                       "Use 'flashrom -p xxxx:bb:dd.f' \n"
+                       "Use 'flashrom -p xxxx:pci=bb:dd.f' \n"
                        "to explicitly select the card with the given BDF "
                        "(PCI bus, device, function).\n");
                exit(1);

_______________________________________________
flashrom mailing list
[email protected]
http://www.flashrom.org/mailman/listinfo/flashrom

Reply via email to