flashrom July 2010

flashrom@flashrom.org

71 participants
273 discussions

[commit] r1071 - trunk
by repository service 08 Jul '10

08 Jul '10

Author: mkarcher Date: Thu Jul 8 11:32:18 2010 New Revision: 1071 URL: http://flashrom.org/trac/coreboot/changeset/1071 Log: Fix ASUS A8N-VM CSM board enable entry r1063 had several issues: The PCI IDs for this board are copy/pasted from the A8N and plain wrong for this board and the board enable is marked as tested although it isn't. Finally the board description was slightly wrong and the URL missing. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/board_enable.c trunk/print.c Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Tue Jul 6 11:55:48 2010 (r1070) +++ trunk/board_enable.c Thu Jul 8 11:32:18 2010 (r1071) @@ -321,7 +321,7 @@ * Winbond W83627EHF: Raise GPIO24. * * Suited for: - * - Asus A8N VM CSM + * - Asus A8N-VM CSM: AMD Socket 939 + GeForce 6150 (C51) + MCP51. */ static int w83627ehf_gpio24_raise_2e() { @@ -1601,7 +1601,7 @@ {0x8086, 0x27A0, 0x1043, 0x1287, 0x8086, 0x27DF, 0x1043, 0x1287, "^A8J", NULL, NULL, "ASUS", "A8JM", 0, NT, intel_ich_gpio34_raise}, {0x10DE, 0x0260, 0x103c, 0x2a3e, 0x10DE, 0x0264, 0x103c, 0x2a3e, "NAGAMI", NULL, NULL, "ASUS", "A8N-LA", 0, NT, nvidia_mcp_gpio0_raise}, {0x10DE, 0x005E, 0x1043, 0x815A, 0x10DE, 0x0054, 0x1043, 0x815A, NULL, NULL, NULL, "ASUS", "A8N", 0, NT, board_shuttle_fn25}, - {0x10DE, 0x005E, 0x1043, 0x815A, 0x10DE, 0x0054, 0x1043, 0x815A, NULL, NULL, NULL, "ASUS", "A8N-VM CSM", 0, OK, w83627ehf_gpio24_raise_2e}, + {0x10de, 0x0264, 0x1043, 0x81bc, 0x10de, 0x02f0, 0x1043, 0x81cd, NULL, NULL, NULL, "ASUS", "A8N-VM CSM", 0, NT, w83627ehf_gpio24_raise_2e}, {0x10DE, 0x0264, 0x1043, 0x81C0, 0x10DE, 0x0260, 0x1043, 0x81C0, NULL, NULL, NULL, "ASUS", "M2NBP-VM CSM", 0, OK, nvidia_mcp_gpio0_raise}, {0x1106, 0x1336, 0x1043, 0x80ed, 0x1106, 0x3288, 0x1043, 0x8249, NULL, NULL, NULL, "ASUS", "M2V-MX", 0, OK, via_vt823x_gpio5_raise}, {0x8086, 0x1A30, 0x1043, 0x8025, 0x8086, 0x244B, 0x104D, 0x80F0, NULL, NULL, NULL, "ASUS", "P4B266-LM", 0, OK, intel_ich_gpio21_raise}, Modified: trunk/print.c ============================================================================== --- trunk/print.c Tue Jul 6 11:55:48 2010 (r1070) +++ trunk/print.c Thu Jul 8 11:32:18 2010 (r1071) @@ -288,6 +288,7 @@ B("ASUS", "A8N-E", 1, "http://www.asus.com/product.aspx?P_ID=DzbA8hgqchMBOVRz", NULL), B("ASUS", "A8N-SLI", 1, "http://www.asus.com/product.aspx?P_ID=J9FKa8z2xVId3pDK", NULL), B("ASUS", "A8N-SLI Premium", 1, "http://www.asus.com/product.aspx?P_ID=nbulqxniNmzf0mH1", NULL), + B("ASUS", "A8N-VM CSM", 1, "http://www.asus.com/product.aspx?P_ID=JBqqlpj4cspbSa3s", NULL), B("ASUS", "A8NE-FM/S", 1, "http://www.hardwareschotte.de/hardware/preise/proid_1266090/preis_ASUS+A8NE…", NULL), B("ASUS", "A8V Deluxe", 1, "http://www.asus.com/product.aspx?P_ID=tvpdgPNCPaABZRVU", NULL), B("ASUS", "A8V-E Deluxe", 1, "http://www.asus.com/product.aspx?P_ID=hQBPIJWEZnnGAZEh", NULL),

1 0

Re: [flashrom] [PATCH] Board enable for HP Vectra VL420SFF
by Mattias Mattsson 07 Jul '10

07 Jul '10

On Fri, Feb 12, 2010 at 05:09:59PM +0100, Michael Karcher wrote: > --- > Hello Mattias, could you please try whether current svn flashrom (at least > r896) with this patch applied outputs > Disabling write protection for HP VL420 SFF > on invocation with "flashrom -V"? If yes, please reply to this mail with a > mail containing the line "Acked-by: Mattias Mattsson <vitplister(a)gmail.com>". > You don't have to try anything dangerous like erasing/writing the flash > chip, as only the board recognition has changed. Tested with latest flashrom (r1070). Read, write, erase and verify works as expected. Logs attached. Many thanks for your work and sorry for taking so long to test. -mattias

1 0

[PATCH] Fix ASUS A8N-VM CSM board enable entry
by Michael Karcher 07 Jul '10

07 Jul '10

r1063 had several issues: The PCI IDs for this board are copy/pasted from the A8N and plain wrong for this board and the board enable is marked as tested although it isn't. Finally the board description was slightly wrong and the URL missing. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> --- board_enable.c | 4 ++-- print.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/board_enable.c b/board_enable.c index 44267b0..1c12b51 100644 --- a/board_enable.c +++ b/board_enable.c @@ -321,7 +321,7 @@ static int w83627hf_gpio24_raise_2e() * Winbond W83627EHF: Raise GPIO24. * * Suited for: - * - Asus A8N VM CSM + * - Asus A8N-VM CSM: AMD Socket 939 + GeForce 6150 (C51) + MCP51. */ static int w83627ehf_gpio24_raise_2e() { @@ -1601,7 +1601,7 @@ const struct board_pciid_enable board_pciid_enables[] = { {0x8086, 0x27A0, 0x1043, 0x1287, 0x8086, 0x27DF, 0x1043, 0x1287, "^A8J", NULL, NULL, "ASUS", "A8JM", 0, NT, intel_ich_gpio34_raise}, {0x10DE, 0x0260, 0x103c, 0x2a3e, 0x10DE, 0x0264, 0x103c, 0x2a3e, "NAGAMI", NULL, NULL, "ASUS", "A8N-LA", 0, NT, nvidia_mcp_gpio0_raise}, {0x10DE, 0x005E, 0x1043, 0x815A, 0x10DE, 0x0054, 0x1043, 0x815A, NULL, NULL, NULL, "ASUS", "A8N", 0, NT, board_shuttle_fn25}, - {0x10DE, 0x005E, 0x1043, 0x815A, 0x10DE, 0x0054, 0x1043, 0x815A, NULL, NULL, NULL, "ASUS", "A8N-VM CSM", 0, OK, w83627ehf_gpio24_raise_2e}, + {0x10de, 0x0264, 0x1043, 0x81bc, 0x10de, 0x02f0, 0x1043, 0x81cd, NULL, NULL, NULL, "ASUS", "A8N-VM CSM", 0, NT, w83627ehf_gpio24_raise_2e}, {0x10DE, 0x0264, 0x1043, 0x81C0, 0x10DE, 0x0260, 0x1043, 0x81C0, NULL, NULL, NULL, "ASUS", "M2NBP-VM CSM", 0, OK, nvidia_mcp_gpio0_raise}, {0x1106, 0x1336, 0x1043, 0x80ed, 0x1106, 0x3288, 0x1043, 0x8249, NULL, NULL, NULL, "ASUS", "M2V-MX", 0, OK, via_vt823x_gpio5_raise}, {0x8086, 0x1A30, 0x1043, 0x8025, 0x8086, 0x244B, 0x104D, 0x80F0, NULL, NULL, NULL, "ASUS", "P4B266-LM", 0, OK, intel_ich_gpio21_raise}, diff --git a/print.c b/print.c index 3bb14ed..65ff1e3 100644 --- a/print.c +++ b/print.c @@ -288,6 +288,7 @@ const struct board_info boards_known[] = { B("ASUS", "A8N-E", 1, "http://www.asus.com/product.aspx?P_ID=DzbA8hgqchMBOVRz", NULL), B("ASUS", "A8N-SLI", 1, "http://www.asus.com/product.aspx?P_ID=J9FKa8z2xVId3pDK", NULL), B("ASUS", "A8N-SLI Premium", 1, "http://www.asus.com/product.aspx?P_ID=nbulqxniNmzf0mH1", NULL), + B("ASUS", "A8N-VM CSM", 1, "http://www.asus.com/product.aspx?P_ID=JBqqlpj4cspbSa3s", NULL), B("ASUS", "A8NE-FM/S", 1, "http://www.hardwareschotte.de/hardware/preise/proid_1266090/preis_ASUS+A8NE…", NULL), B("ASUS", "A8V Deluxe", 1, "http://www.asus.com/product.aspx?P_ID=tvpdgPNCPaABZRVU", NULL), B("ASUS", "A8V-E Deluxe", 1, "http://www.asus.com/product.aspx?P_ID=hQBPIJWEZnnGAZEh", NULL), -- 1.7.1

1 0

[PATCH] Board enable for ASUS P5PE-VM
by Michael Karcher 07 Jul '10

07 Jul '10

Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> --- board_enable.c | 2 ++ print.c | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/board_enable.c b/board_enable.c index 44267b0..a32a114 100644 --- a/board_enable.c +++ b/board_enable.c @@ -1189,6 +1189,7 @@ static int intel_ich_gpio19_raise(void) * - ASUS P4B266LM (Sony Vaio PCV-RX650): socket478 + 845D + ICH2. * - ASUS P4C800-E Deluxe: socket478 + 875P + ICH5. * - ASUS P4P800-E Deluxe: Intel socket478 + 865PE + ICH5R. + * - ASUS P5PE-VM: Intel LGA775 + 865G + ICH5. */ static int intel_ich_gpio21_raise(void) { @@ -1611,6 +1612,7 @@ const struct board_pciid_enable board_pciid_enables[] = { {0x8086, 0x2570, 0x1043, 0x80F2, 0x105A, 0x3373, 0x1043, 0x80F5, NULL, NULL, NULL, "ASUS", "P4P800-E Deluxe", 0, OK, intel_ich_gpio21_raise}, {0x10B9, 0x1541, 0, 0, 0x10B9, 0x1533, 0, 0, "^P5A$", "asus", "p5a", "ASUS", "P5A", 0, OK, board_asus_p5a}, {0x10DE, 0x0030, 0x1043, 0x818a, 0x8086, 0x100E, 0x1043, 0x80EE, NULL, NULL, NULL, "ASUS", "P5ND2-SLI Deluxe", 0, OK, nvidia_mcp_gpio10_raise}, + {0x8086, 0x24dd, 0x1043, 0x80a6, 0x8086, 0x2570, 0x1043, 0x8157, NULL, NULL, NULL, "ASUS", "P5PE-VM", 0, OK, intel_ich_gpio21_raise}, {0x1106, 0x3149, 0x1565, 0x3206, 0x1106, 0x3344, 0x1565, 0x1202, NULL, NULL, NULL, "Biostar", "P4M80-M4", 0, OK, it8705f_write_enable_2e}, {0x8086, 0x3590, 0x1028, 0x016c, 0x1000, 0x0030, 0x1028, 0x016c, NULL, NULL, NULL, "Dell", "PowerEdge 1850", 0, OK, intel_ich_gpio23_raise}, {0x1039, 0x5513, 0x1019, 0x0A41, 0x1039, 0x0018, 0, 0, NULL, NULL, NULL, "Elitegroup", "K7S6A", 0, OK, it8705f_write_enable_2e}, diff --git a/print.c b/print.c index 3bb14ed..a996bcb 100644 --- a/print.c +++ b/print.c @@ -321,6 +321,7 @@ const struct board_info boards_known[] = { B("ASUS", "P5KC", 1, "http://www.asus.com/product.aspx?P_ID=fFZ8oUIGmLpwNMjj", NULL), B("ASUS", "P5L-MX", 1, "http://www.asus.com/product.aspx?P_ID=X70d3NCzH2DE9vWH", NULL), B("ASUS", "P5ND2-SLI Deluxe", 1, "http://www.asus.com/product.aspx?P_ID=WY7XroDuUImVbgp5", NULL), + B("ASUS", "P5PE-VM", 1, "http://www.asus.com/product.aspx?P_ID=k3h0ZFVu9Lo1dUvk", NULL), B("ASUS", "P6T Deluxe", 1, "http://www.asus.com/product.aspx?P_ID=vXixf82co6Q5v0BZ", NULL), B("ASUS", "P6T Deluxe V2", 1, "http://www.asus.com/product.aspx?P_ID=iRlP8RG9han6saZx", NULL), B("BCOM", "WinNET100", 1, "http://www.coreboot.org/BCOM_WINNET100", "Used in the IGEL-316 thin client."), -- 1.7.1

1 0

gigabyte dual bios programming
by Qing Pei Wang 06 Jul '10

06 Jul '10

hi all, Since i am trying to do my 780 mass porting, i faced a problem about Gigabyte dual bios mainboard. my SF100 programmer can not detect the spi chip unless i removed it from the mainboard, but i can not use this method to test my coreboot code for i would program the chip lots of time. Is there any idea about this? it's pretty strange about these dual bios things. Any suggestion will be welcome for me. -- Wang Qing Pei MSN:wangqingpei@hotmail.com <MSN%3Awangqingpei(a)hotmail.com> Gmail:wangqingpei@gmail.com <Gmail%3Awangqingpei(a)gmail.com> Phone:86+13426369984

2 1

[PATCH] Use extract_param everywhere
by Carl-Daniel Hailfinger 06 Jul '10

06 Jul '10

Various places in the flashrom source feature custom parameter extraction from programmer_param. This led to wildly differing syntax for programmer parameters, and it also voids pretty much every assumption you could make about programmer_param. The latter is a problem for libflashrom. Use extract_param everywhere, clean up related code and make it more foolproof. Add two instances of exit(1) where we have no option to return an error. Remove six instances of exit(1) where returning an error was possible. Once this patch is in, it is very easy to make programmer_param static. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-extract_param_everywhere/flashrom.8 =================================================================== --- flashrom-extract_param_everywhere/flashrom.8 (Revision 1067) +++ flashrom-extract_param_everywhere/flashrom.8 (Arbeitskopie) @@ -183,7 +183,7 @@ .BR "* ft2232_spi" " (for SPI flash ROMs attached to a FT2232H/FT4232H based\ USB SPI programmer)" .sp -.BR "* serprog" " (for flash ROMs attached to Urja's AVR programmer)" +.BR "* serprog" " (for flash ROMs attached to a programmer speaking serprog)" .sp .BR "* buspirate_spi" " (for SPI flash ROMs attached to a Bus Pirate)" .sp @@ -296,22 +296,23 @@ .BR "dummy " programmer An optional parameter specifies the bus types it should support. For that you have to use the -.B "flashrom \-p dummy:type" +.B "flashrom \-p dummy:bus=[type[+type[+type]]]" syntax where .B type -can be any comma-separated combination of -.BR parallel ", " lpc ", " fwh ", " spi ", or " all -(in any order). +can be any of +.BR parallel ", " lpc ", " fwh ", " spi +in any order. If you specify bus without type, all buses will be disabled. +If you do not specify bus, all buses will be enabled. .sp Example: -.B "flashrom \-p dummy:lpc,fwh" +.B "flashrom \-p dummy:bus=lpc+fwh" .TP .BR "nic3com" , " nicrealtek" , " nicsmc1211" , " 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 -.BR "flashrom \-p xxxx:bb:dd.f" , +.BR "flashrom \-p xxxx:pci=bb:dd.f" , where .B xxxx is the name of the programmer @@ -323,7 +324,7 @@ is the PCI function number of the desired device. .sp Example: -.B "flashrom \-p nic3com:05:04.0" +.B "flashrom \-p nic3com:pci=05:04.0" .TP .BR "it87spi " programmer An optional @@ -342,7 +343,7 @@ An optional parameter specifies the controller type and interface/port it should support. For that you have to use the .sp -.B " flashrom \-p ft2232_spi:model,port=interface" +.B " flashrom \-p ft2232_spi:type=model,port=interface" .sp syntax where .B model @@ -363,11 +364,11 @@ programmer. In the device/baud combination, the device has to start with a slash. For serial, you have to use the .sp -.B " flashrom \-p serprog:/dev/device:baud" +.B " flashrom \-p serprog:dev=/dev/device:baud" .sp syntax and for IP, you have to use .sp -.B " flashrom \-p serprog:ip:port" +.B " flashrom \-p serprog:ip=ipaddr:port" .sp instead. More information about serprog is available in .B serprog-protocol.txt Index: flashrom-extract_param_everywhere/drkaiser.c =================================================================== --- flashrom-extract_param_everywhere/drkaiser.c (Revision 1067) +++ flashrom-extract_param_everywhere/drkaiser.c (Arbeitskopie) @@ -36,10 +36,14 @@ int drkaiser_init(void) { uint32_t addr; + char *devstring; get_io_perms(); + + devstring = extract_param(&programmer_param, "pci", ","); pcidev_init(PCI_VENDOR_ID_DRKAISER, PCI_BASE_ADDRESS_2, - drkaiser_pcidev, programmer_param); + drkaiser_pcidev, devstring); + free(devstring); /* Write magic register to enable flash write. */ pci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, @@ -53,6 +57,7 @@ addr, 128 * 1024); buses_supported = CHIP_BUSTYPE_PARALLEL; + return 0; } @@ -60,7 +65,6 @@ { /* Write protect the flash again. */ pci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, 0); - free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Index: flashrom-extract_param_everywhere/it87spi.c =================================================================== --- flashrom-extract_param_everywhere/it87spi.c (Revision 1067) +++ flashrom-extract_param_everywhere/it87spi.c (Arbeitskopie) @@ -142,22 +142,24 @@ flashport = sio_read(port, 0x64) << 8; flashport |= sio_read(port, 0x65); msg_pdbg("Serial flash port 0x%04x\n", flashport); - if (programmer_param && !strlen(programmer_param)) { - free(programmer_param); - programmer_param = NULL; + /* Non-default port requested? */ + portpos = extract_param(&programmer_param, "it87spiport", ",:"); + if (portpos && strlen(portpos)) { + flashport = strtol(portpos, (char **)NULL, 0); + msg_pinfo("Forcing serial flash port 0x%04x\n", + flashport); + sio_write(port, 0x64, (flashport >> 8)); + sio_write(port, 0x65, (flashport & 0xff)); + } else if (portpos) { + msg_perr("Error: it87spiport specified, but no port " + "given.\n"); + free(portpos); + /* FIXME: Return failure here once it87spi_common_init() + * can handle the return value sanely. + */ + exit(1); } - if (programmer_param) { - portpos = extract_param(&programmer_param, - "it87spiport=", ",:"); - if (portpos) { - flashport = strtol(portpos, (char **)NULL, 0); - msg_pinfo("Forcing serial flash port 0x%04x\n", - flashport); - sio_write(port, 0x64, (flashport >> 8)); - sio_write(port, 0x65, (flashport & 0xff)); - free(portpos); - } - } + free(portpos); exit_conf_mode_ite(port); break; /* TODO: Handle more IT87xx if they support flash translation */ Index: flashrom-extract_param_everywhere/buspirate_spi.c =================================================================== --- flashrom-extract_param_everywhere/buspirate_spi.c (Revision 1067) +++ flashrom-extract_param_everywhere/buspirate_spi.c (Arbeitskopie) @@ -101,24 +101,18 @@ char *speed = NULL; int spispeed = 0x7; - if (programmer_param && !strlen(programmer_param)) { - free(programmer_param); - programmer_param = NULL; - } - if (programmer_param) { - dev = extract_param(&programmer_param, "dev=", ",:"); - speed = extract_param(&programmer_param, "spispeed=", ",:"); - if (strlen(programmer_param)) - msg_perr("Unhandled programmer parameters: %s\n", - programmer_param); - free(programmer_param); - programmer_param = NULL; - } - if (!dev) { + dev = extract_param(&programmer_param, "dev", ",:"); + if (!dev || !strlen(dev)) { msg_perr("No serial device given. Use flashrom -p " "buspirate_spi:dev=/dev/ttyUSB0\n"); return 1; } + ret = buspirate_serialport_setup(dev); + if (ret) + return ret; + free(dev); + + speed = extract_param(&programmer_param, "spispeed", ",:"); if (speed) { for (i = 0; spispeeds[i].name; i++) if (!strncasecmp(spispeeds[i].name, speed, @@ -129,13 +123,11 @@ if (!spispeeds[i].name) msg_perr("Invalid SPI speed, using default.\n"); } + free(speed); + /* This works because speeds numbering starts at 0 and is contiguous. */ msg_pdbg("SPI speed is %sHz\n", spispeeds[spispeed].name); - ret = buspirate_serialport_setup(dev); - if (ret) - return ret; - /* This is the brute force version, but it should work. */ for (i = 0; i < 19; i++) { /* Enter raw bitbang mode */ Index: flashrom-extract_param_everywhere/gfxnvidia.c =================================================================== --- flashrom-extract_param_everywhere/gfxnvidia.c (Revision 1067) +++ flashrom-extract_param_everywhere/gfxnvidia.c (Arbeitskopie) @@ -58,11 +58,15 @@ int gfxnvidia_init(void) { uint32_t reg32; + char *devstring; get_io_perms(); + devstring = extract_param(&programmer_param, "pci", ","); io_base_addr = pcidev_init(PCI_VENDOR_ID_NVIDIA, PCI_BASE_ADDRESS_0, - gfx_nvidia, programmer_param); + gfx_nvidia, devstring); + free(devstring); + io_base_addr += 0x300000; msg_pinfo("Detected NVIDIA I/O base address: 0x%x.\n", io_base_addr); @@ -87,7 +91,6 @@ reg32 |= (1 << 0); pci_write_long(pcidev_dev, 0x50, reg32); - free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Index: flashrom-extract_param_everywhere/atahpt.c =================================================================== --- flashrom-extract_param_everywhere/atahpt.c (Revision 1067) +++ flashrom-extract_param_everywhere/atahpt.c (Arbeitskopie) @@ -41,11 +41,14 @@ int atahpt_init(void) { uint32_t reg32; + char *devstring; get_io_perms(); + devstring = extract_param(&programmer_param, "pci", ","); io_base_addr = pcidev_init(PCI_VENDOR_ID_HPT, PCI_BASE_ADDRESS_4, - ata_hpt, programmer_param); + ata_hpt, devstring); + free(devstring); /* Enable flash access. */ reg32 = pci_read_long(pcidev_dev, REG_FLASH_ACCESS); @@ -66,7 +69,6 @@ reg32 &= ~(1 << 24); pci_write_long(pcidev_dev, REG_FLASH_ACCESS, reg32); - free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Index: flashrom-extract_param_everywhere/serprog.c =================================================================== --- flashrom-extract_param_everywhere/serprog.c (Revision 1067) +++ flashrom-extract_param_everywhere/serprog.c (Arbeitskopie) @@ -298,43 +298,80 @@ int serprog_init(void) { uint16_t iface; - int len; unsigned char pgmname[17]; unsigned char rbuf[3]; unsigned char c; - char *num; - char *dev; - msg_pspew("%s\n", __func__); - /* the parameter is either of format "/dev/device:baud" or "ip:port" */ - if ((!programmer_param) || (!strlen(programmer_param))) { - nodevice: - msg_perr("Error: No device/host given for the serial programmer driver.\n" - "Use flashrom -p serprog=/dev/device:baud or flashrom -p serprog=ip:port\n"); - exit(1); + char *device; + char *baudport; + int have_device = 0; + + /* the parameter is either of format "dev=/dev/device:baud" or "ip=ip:port" */ + device = extract_param(&programmer_param, "dev", ","); + if (device && strlen(device)) { + baudport = strstr(device, ":"); + if (baudport) { + /* Split device from baudrate. */ + *baudport = '\0'; + baudport++; + } + if (!baudport || !strlen(baudport)) { + msg_perr("Error: No baudrate specified.\n" + "Use flashrom -p serprog:dev=/dev/device:baud\n"); + free(device); + return 1; + } + if (strlen(device)) { + sp_fd = sp_openserport(device, atoi(baudport)); + have_device++; + } } - num = strstr(programmer_param, ":"); - len = num - programmer_param; - if (!len) goto nodevice; - if (!num) { - msg_perr("Error: No port or baudrate specified to serial programmer driver.\n" - "Use flashrom -p serprog=/dev/device:baud or flashrom -p serprog=ip:port\n"); - exit(1); + if (device && !strlen(device)) { + msg_perr("Error: No device specified.\n" + "Use flashrom -p serprog:dev=/dev/device:baud\n"); + free(device); + return 1; } - len = num - programmer_param; - dev = malloc(len + 1); - if (!dev) sp_die("Error: memory allocation failure"); - memcpy(dev, programmer_param, len); - dev[len] = 0; - num = strdup(num + 1); - if (!num) sp_die("Error: memory allocation failure"); - free(programmer_param); - programmer_param = NULL; + free(device); - if (dev[0] == '/') sp_fd = sp_openserport(dev, atoi(num)); - else sp_fd = sp_opensocket(dev, atoi(num)); + device = extract_param(&programmer_param, "ip", ","); + if (have_device && device) { + msg_perr("Error: Both host and device specified.\n" + "Please use either dev= or ip= but not both.\n"); + free(device); + return 1; + } + if (device && strlen(device)) { + baudport = strstr(device, ":"); + if (baudport) { + /* Split host from port. */ + *baudport = '\0'; + baudport++; + } + if (!baudport || !strlen(baudport)) { + msg_perr("Error: No port specified.\n" + "Use flashrom -p serprog:ip=ipaddr:port\n"); + free(device); + return 1; + } + if (strlen(device)) { + sp_fd = sp_opensocket(device, atoi(baudport)); + have_device++; + } + } + if (device && !strlen(device)) { + msg_perr("Error: No host specified.\n" + "Use flashrom -p serprog:ip=ipaddr:port\n"); + free(device); + return 1; + } + free(device); - free(dev); dev = NULL; - free(num); num = NULL; + if (!have_device) { + msg_perr("Error: Neither host nor device specified.\n" + "Use flashrom -p serprog:dev=/dev/device:baud or " + "flashrom -p serprog:ip=ipaddr:port\n"); + return 1; + } msg_pdbg(MSGHEADER "connected - attempting to synchronize\n"); Index: flashrom-extract_param_everywhere/nicrealtek.c =================================================================== --- flashrom-extract_param_everywhere/nicrealtek.c (Revision 1067) +++ flashrom-extract_param_everywhere/nicrealtek.c (Arbeitskopie) @@ -41,10 +41,14 @@ int nicrealtek_init(void) { + char *devstring; + get_io_perms(); + devstring = extract_param(&programmer_param, "pci", ","); io_base_addr = pcidev_init(PCI_VENDOR_ID_REALTEK, PCI_BASE_ADDRESS_0, - nics_realtek, programmer_param); + nics_realtek, devstring); + free(devstring); buses_supported = CHIP_BUSTYPE_PARALLEL; @@ -53,10 +57,14 @@ int nicsmc1211_init(void) { + char *devstring; + get_io_perms(); + devstring = extract_param(&programmer_param, "pci", ","); io_base_addr = pcidev_init(PCI_VENDOR_ID_SMC1211, PCI_BASE_ADDRESS_0, - nics_realteksmc1211, programmer_param); + nics_realteksmc1211, devstring); + free(devstring); buses_supported = CHIP_BUSTYPE_PARALLEL; @@ -66,7 +74,6 @@ int nicrealtek_shutdown(void) { /* FIXME: We forgot to disable software access again. */ - free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Index: flashrom-extract_param_everywhere/nic3com.c =================================================================== --- flashrom-extract_param_everywhere/nic3com.c (Revision 1067) +++ flashrom-extract_param_everywhere/nic3com.c (Arbeitskopie) @@ -56,10 +56,15 @@ int nic3com_init(void) { + char *devstring; + get_io_perms(); + devstring = extract_param(&programmer_param, "pci", ","); io_base_addr = pcidev_init(PCI_VENDOR_ID_3COM, PCI_BASE_ADDRESS_0, - nics_3com, programmer_param); + nics_3com, devstring); + free(devstring); + id = pcidev_dev->device_id; /* 3COM 3C90xB cards need a special fixup. */ @@ -96,7 +101,6 @@ OUTL(internal_conf, io_base_addr + INTERNAL_CONFIG); } - free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Index: flashrom-extract_param_everywhere/ft2232_spi.c =================================================================== --- flashrom-extract_param_everywhere/ft2232_spi.c (Revision 1067) +++ flashrom-extract_param_everywhere/ft2232_spi.c (Arbeitskopie) @@ -76,46 +76,49 @@ int f; struct ftdi_context *ftdic = &ftdic_context; unsigned char buf[512]; - char *portpos = NULL; int ft2232_type = FTDI_FT4232H; enum ftdi_interface ft2232_interface = INTERFACE_B; + char *arg; - if (ftdi_init(ftdic) < 0) { - msg_perr("ftdi_init failed\n"); - return EXIT_FAILURE; // TODO - } - - if (programmer_param && !strlen(programmer_param)) { - free(programmer_param); - programmer_param = NULL; - } - if (programmer_param) { - if (strstr(programmer_param, "2232")) + arg = extract_param(&programmer_param, "type", ",:"); + if (arg) { + if (!strcmp(arg, "2232H")) ft2232_type = FTDI_FT2232H; - if (strstr(programmer_param, "4232")) + else if (!strcmp(arg, "4232H")) ft2232_type = FTDI_FT4232H; - portpos = strstr(programmer_param, "port="); - if (portpos) { - portpos += 5; - switch (toupper(*portpos)) { - case 'A': - ft2232_interface = INTERFACE_A; - break; - case 'B': - ft2232_interface = INTERFACE_B; - break; - default: - msg_perr("Invalid interface specified, " - "using default.\n"); - } + else { + msg_perr("Error: Invalid device type specified.\n"); + free(arg); + return 1; } - free(programmer_param); } + free(arg); + arg = extract_param(&programmer_param, "port", ",:"); + if (arg) { + switch (toupper(*arg)) { + case 'A': + ft2232_interface = INTERFACE_A; + break; + case 'B': + ft2232_interface = INTERFACE_B; + break; + default: + msg_perr("Error: Invalid port/interface specified.\n"); + free(arg); + return 1; + } + } + free(arg); msg_pdbg("Using device type %s ", (ft2232_type == FTDI_FT2232H) ? "2232H" : "4232H"); msg_pdbg("interface %s\n", (ft2232_interface == INTERFACE_A) ? "A" : "B"); + if (ftdi_init(ftdic) < 0) { + msg_perr("ftdi_init failed\n"); + return EXIT_FAILURE; // TODO + } + f = ftdi_usb_open(ftdic, 0x0403, ft2232_type); if (f < 0 && f != -5) { Index: flashrom-extract_param_everywhere/satasii.c =================================================================== --- flashrom-extract_param_everywhere/satasii.c (Revision 1067) +++ flashrom-extract_param_everywhere/satasii.c (Arbeitskopie) @@ -43,11 +43,15 @@ { uint32_t addr; uint16_t reg_offset; + char *devstring; get_io_perms(); + devstring = extract_param(&programmer_param, "pci", ","); pcidev_init(PCI_VENDOR_ID_SII, PCI_BASE_ADDRESS_0, satas_sii, - programmer_param); + devstring); + free(devstring); + id = pcidev_dev->device_id; if ((id == 0x3132) || (id == 0x3124)) { @@ -71,7 +75,6 @@ int satasii_shutdown(void) { - free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Index: flashrom-extract_param_everywhere/dummyflasher.c =================================================================== --- flashrom-extract_param_everywhere/dummyflasher.c (Revision 1067) +++ flashrom-extract_param_everywhere/dummyflasher.c (Arbeitskopie) @@ -25,44 +25,46 @@ #include "flash.h" #include "chipdrivers.h" +static void tolower_string(char *str) +{ + for (; *str != '\0'; str++) + *str = (char)tolower((unsigned char)*str); +} + int dummy_init(void) { - int i; + char *bustext = NULL; + msg_pspew("%s\n", __func__); - /* "all" is equivalent to specifying no type. */ - if (programmer_param && (!strcmp(programmer_param, "all"))) { - free(programmer_param); - programmer_param = NULL; - } - if (!programmer_param) - programmer_param = strdup("parallel,lpc,fwh,spi"); + bustext = extract_param(&programmer_param, "bus", ",:"); + msg_pdbg("Requested buses are: %s\n", bustext ? bustext : "default"); + if (!bustext) + bustext = strdup("parallel+lpc+fwh+spi"); /* Convert the parameters to lowercase. */ - for (i = 0; programmer_param[i] != '\0'; i++) - programmer_param[i] = - (char)tolower((unsigned char)programmer_param[i]); + tolower_string(bustext); buses_supported = CHIP_BUSTYPE_NONE; - if (strstr(programmer_param, "parallel")) { + if (strstr(bustext, "parallel")) { buses_supported |= CHIP_BUSTYPE_PARALLEL; msg_pdbg("Enabling support for %s flash.\n", "parallel"); } - if (strstr(programmer_param, "lpc")) { + if (strstr(bustext, "lpc")) { buses_supported |= CHIP_BUSTYPE_LPC; msg_pdbg("Enabling support for %s flash.\n", "LPC"); } - if (strstr(programmer_param, "fwh")) { + if (strstr(bustext, "fwh")) { buses_supported |= CHIP_BUSTYPE_FWH; msg_pdbg("Enabling support for %s flash.\n", "FWH"); } - if (strstr(programmer_param, "spi")) { + if (strstr(bustext, "spi")) { buses_supported |= CHIP_BUSTYPE_SPI; spi_controller = SPI_CONTROLLER_DUMMY; msg_pdbg("Enabling support for %s flash.\n", "SPI"); } if (buses_supported == CHIP_BUSTYPE_NONE) msg_pdbg("Support for all flash bus types disabled.\n"); - free(programmer_param); + free(bustext); return 0; } Index: flashrom-extract_param_everywhere/chipset_enable.c =================================================================== --- flashrom-extract_param_everywhere/chipset_enable.c (Revision 1067) +++ flashrom-extract_param_everywhere/chipset_enable.c (Arbeitskopie) @@ -300,11 +300,8 @@ int max_decode_fwh_decode = 0; int contiguous = 1; - if (programmer_param) - idsel = strstr(programmer_param, "fwh_idsel="); - - if (idsel) { - idsel += strlen("fwh_idsel="); + idsel = extract_param(&programmer_param, "fwh_idsel", ",:"); + if (idsel && strlen(idsel)) { fwh_conf = (uint32_t)strtoul(idsel, NULL, 0); /* FIXME: Need to undo this on shutdown. */ @@ -312,7 +309,15 @@ pci_write_long(dev, 0xd0, fwh_conf); pci_write_word(dev, 0xd4, fwh_conf); /* FIXME: Decode settings are not changed. */ + } else if (idsel) { + msg_perr("Error: idsel= specified, but no number given.\n"); + free(idsel); + /* FIXME: Return failure here once internal_init() starts + * to care about the return value of the chipset enable. + */ + exit(1); } + free(idsel); /* Ignore all legacy ranges below 1 MB. * We currently only support flashing the chip which responds to Index: flashrom-extract_param_everywhere/flashrom.c =================================================================== --- flashrom-extract_param_everywhere/flashrom.c (Revision 1067) +++ flashrom-extract_param_everywhere/flashrom.c (Arbeitskopie) @@ -428,7 +428,15 @@ int programmer_init(void) { - return programmer_table[programmer].init(); + int ret; + + ret = programmer_table[programmer].init(); + if (programmer_param && strlen(programmer_param)) { + msg_perr("Unhandled programmer parameters: %s\n", + programmer_param); + ret = 1; + } + return ret; } int programmer_shutdown(void) @@ -536,22 +544,24 @@ char *strcat_realloc(char *dest, const char *src) { dest = realloc(dest, strlen(dest) + strlen(src) + 1); - if (!dest) + if (!dest) { + msg_gerr("Out of memory!\n"); return NULL; + } strcat(dest, src); return dest; } /* This is a somewhat hacked function similar in some ways to strtok(). - * It will look for needle in haystack, return a copy of needle and remove - * everything from the first occurrence of needle to the next delimiter - * from haystack. + * It will look for needle with a subsequent '=' in haystack, return a copy of + * needle and remove everything from the first occurrence of needle to the next + * delimiter from haystack. */ char *extract_param(char **haystack, char *needle, char *delim) { - char *param_pos, *rest, *tmp; - char *dev = NULL; - int devlen; + char *param_pos, *opt_pos, *rest; + char *opt = NULL; + int optlen; int needlelen; needlelen = strlen(needle); @@ -567,43 +577,41 @@ do { if (!param_pos) return NULL; - /* Beginning of the string? */ - if (param_pos == *haystack) - break; - /* After a delimiter? */ - if (strchr(delim, *(param_pos - 1))) - break; + /* Needle followed by '='? */ + if (param_pos[needlelen] == '=') { + + /* Beginning of the string? */ + if (param_pos == *haystack) + break; + /* After a delimiter? */ + if (strchr(delim, *(param_pos - 1))) + break; + } /* Continue searching. */ param_pos++; param_pos = strstr(param_pos, needle); } while (1); - + if (param_pos) { - param_pos += strlen(needle); - devlen = strcspn(param_pos, delim); - if (devlen) { - dev = malloc(devlen + 1); - if (!dev) { - msg_gerr("Out of memory!\n"); - exit(1); - } - strncpy(dev, param_pos, devlen); - dev[devlen] = '\0'; + /* Get the string after needle and '='. */ + opt_pos = param_pos + needlelen + 1; + optlen = strcspn(opt_pos, delim); + /* Return an empty string if the parameter was empty. */ + opt = malloc(optlen + 1); + if (!opt) { + msg_gerr("Out of memory!\n"); + exit(1); } - rest = param_pos + devlen; + strncpy(opt, opt_pos, optlen); + opt[optlen] = '\0'; + rest = opt_pos + optlen; + /* Skip all delimiters after the current parameter. */ rest += strspn(rest, delim); - param_pos -= strlen(needle); memmove(param_pos, rest, strlen(rest) + 1); - tmp = realloc(*haystack, strlen(*haystack) + 1); - if (!tmp) { - msg_gerr("Out of memory!\n"); - exit(1); - } - *haystack = tmp; + /* We could shrink haystack, but the effort is not worth it. */ } - - return dev; + return opt; } /* start is an offset to the base address of the flash chip */ Index: flashrom-extract_param_everywhere/internal.c =================================================================== --- flashrom-extract_param_everywhere/internal.c (Revision 1067) +++ flashrom-extract_param_everywhere/internal.c (Arbeitskopie) @@ -121,36 +121,45 @@ int force_laptop = 0; char *arg; - arg = extract_param(&programmer_param, "boardenable=", ",:"); + arg = extract_param(&programmer_param, "boardenable", ",:"); if (arg && !strcmp(arg,"force")) { force_boardenable = 1; } else if (arg && !strlen(arg)) { msg_perr("Missing argument for boardenable.\n"); + free(arg); + return 1; } else if (arg) { msg_perr("Unknown argument for boardenable: %s\n", arg); - exit(1); + free(arg); + return 1; } free(arg); - arg = extract_param(&programmer_param, "boardmismatch=", ",:"); + arg = extract_param(&programmer_param, "boardmismatch", ",:"); if (arg && !strcmp(arg,"force")) { force_boardmismatch = 1; } else if (arg && !strlen(arg)) { msg_perr("Missing argument for boardmismatch.\n"); + free(arg); + return 1; } else if (arg) { msg_perr("Unknown argument for boardmismatch: %s\n", arg); - exit(1); + free(arg); + return 1; } free(arg); - arg = extract_param(&programmer_param, "laptop=", ",:"); + arg = extract_param(&programmer_param, "laptop", ",:"); if (arg && !strcmp(arg,"force_I_want_a_brick")) { force_laptop = 1; } else if (arg && !strlen(arg)) { msg_perr("Missing argument for laptop.\n"); + free(arg); + return 1; } else if (arg) { msg_perr("Unknown argument for laptop: %s\n", arg); - exit(1); + free(arg); + return 1; } free(arg); Index: flashrom-extract_param_everywhere/nicnatsemi.c =================================================================== --- flashrom-extract_param_everywhere/nicnatsemi.c (Revision 1067) +++ flashrom-extract_param_everywhere/nicnatsemi.c (Arbeitskopie) @@ -36,10 +36,14 @@ int nicnatsemi_init(void) { + char *devstring; + get_io_perms(); + devstring = extract_param(&programmer_param, "pci", ","); io_base_addr = pcidev_init(PCI_VENDOR_ID_NATSEMI, PCI_BASE_ADDRESS_0, - nics_natsemi, programmer_param); + nics_natsemi, devstring); + free(devstring); buses_supported = CHIP_BUSTYPE_PARALLEL; @@ -48,7 +52,6 @@ int nicnatsemi_shutdown(void) { - free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; -- http://www.hailfinger.org/

2 6

[commit] r1070 - trunk
by repository service 06 Jul '10

06 Jul '10

Author: hailfinger Date: Tue Jul 6 11:55:48 2010 New Revision: 1070 URL: http://flashrom.org/trac/coreboot/changeset/1070 Log: Various places in the flashrom source feature custom parameter extraction from programmer_param. This led to wildly differing syntax for programmer parameters, and it also voids pretty much every assumption you could make about programmer_param. The latter is a problem for libflashrom. Use extract_param everywhere, clean up related code and make it more foolproof. Add two instances of exit(1) where we have no option to return an error. Remove six instances of exit(1) where returning an error was possible. WARNING: This changes programmer parameter syntax for a few programmers! Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Modified: trunk/atahpt.c trunk/buspirate_spi.c trunk/chipset_enable.c trunk/drkaiser.c trunk/dummyflasher.c trunk/flash.h trunk/flashrom.8 trunk/flashrom.c trunk/ft2232_spi.c trunk/gfxnvidia.c trunk/internal.c trunk/it87spi.c trunk/nic3com.c trunk/nicnatsemi.c trunk/nicrealtek.c trunk/pcidev.c trunk/satasii.c trunk/serprog.c Modified: trunk/atahpt.c ============================================================================== --- trunk/atahpt.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/atahpt.c Tue Jul 6 11:55:48 2010 (r1070) @@ -45,7 +45,7 @@ get_io_perms(); io_base_addr = pcidev_init(PCI_VENDOR_ID_HPT, PCI_BASE_ADDRESS_4, - ata_hpt, programmer_param); + ata_hpt); /* Enable flash access. */ reg32 = pci_read_long(pcidev_dev, REG_FLASH_ACCESS); @@ -66,7 +66,6 @@ reg32 &= ~(1 << 24); pci_write_long(pcidev_dev, REG_FLASH_ACCESS, reg32); - free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Modified: trunk/buspirate_spi.c ============================================================================== --- trunk/buspirate_spi.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/buspirate_spi.c Tue Jul 6 11:55:48 2010 (r1070) @@ -101,24 +101,14 @@ char *speed = NULL; int spispeed = 0x7; - if (programmer_param && !strlen(programmer_param)) { - free(programmer_param); - programmer_param = NULL; - } - if (programmer_param) { - dev = extract_param(&programmer_param, "dev=", ",:"); - speed = extract_param(&programmer_param, "spispeed=", ",:"); - if (strlen(programmer_param)) - msg_perr("Unhandled programmer parameters: %s\n", - programmer_param); - free(programmer_param); - programmer_param = NULL; - } - if (!dev) { + dev = extract_param(&programmer_param, "dev", ",:"); + if (!dev || !strlen(dev)) { msg_perr("No serial device given. Use flashrom -p " "buspirate_spi:dev=/dev/ttyUSB0\n"); return 1; } + + speed = extract_param(&programmer_param, "spispeed", ",:"); if (speed) { for (i = 0; spispeeds[i].name; i++) if (!strncasecmp(spispeeds[i].name, speed, @@ -129,12 +119,15 @@ if (!spispeeds[i].name) msg_perr("Invalid SPI speed, using default.\n"); } + free(speed); + /* This works because speeds numbering starts at 0 and is contiguous. */ msg_pdbg("SPI speed is %sHz\n", spispeeds[spispeed].name); ret = buspirate_serialport_setup(dev); if (ret) return ret; + free(dev); /* This is the brute force version, but it should work. */ for (i = 0; i < 19; i++) { Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/chipset_enable.c Tue Jul 6 11:55:48 2010 (r1070) @@ -300,11 +300,8 @@ int max_decode_fwh_decode = 0; int contiguous = 1; - if (programmer_param) - idsel = strstr(programmer_param, "fwh_idsel="); - - if (idsel) { - idsel += strlen("fwh_idsel="); + idsel = extract_param(&programmer_param, "fwh_idsel", ",:"); + if (idsel && strlen(idsel)) { fwh_conf = (uint32_t)strtoul(idsel, NULL, 0); /* FIXME: Need to undo this on shutdown. */ @@ -312,7 +309,15 @@ pci_write_long(dev, 0xd0, fwh_conf); pci_write_word(dev, 0xd4, fwh_conf); /* FIXME: Decode settings are not changed. */ + } else if (idsel) { + msg_perr("Error: idsel= specified, but no number given.\n"); + free(idsel); + /* FIXME: Return failure here once internal_init() starts + * to care about the return value of the chipset enable. + */ + exit(1); } + free(idsel); /* Ignore all legacy ranges below 1 MB. * We currently only support flashing the chip which responds to Modified: trunk/drkaiser.c ============================================================================== --- trunk/drkaiser.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/drkaiser.c Tue Jul 6 11:55:48 2010 (r1070) @@ -38,8 +38,9 @@ uint32_t addr; get_io_perms(); + pcidev_init(PCI_VENDOR_ID_DRKAISER, PCI_BASE_ADDRESS_2, - drkaiser_pcidev, programmer_param); + drkaiser_pcidev); /* Write magic register to enable flash write. */ pci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, @@ -53,6 +54,7 @@ addr, 128 * 1024); buses_supported = CHIP_BUSTYPE_PARALLEL; + return 0; } @@ -60,7 +62,6 @@ { /* Write protect the flash again. */ pci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, 0); - free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Modified: trunk/dummyflasher.c ============================================================================== --- trunk/dummyflasher.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/dummyflasher.c Tue Jul 6 11:55:48 2010 (r1070) @@ -25,44 +25,46 @@ #include "flash.h" #include "chipdrivers.h" +static void tolower_string(char *str) +{ + for (; *str != '\0'; str++) + *str = (char)tolower((unsigned char)*str); +} + int dummy_init(void) { - int i; + char *bustext = NULL; + msg_pspew("%s\n", __func__); - /* "all" is equivalent to specifying no type. */ - if (programmer_param && (!strcmp(programmer_param, "all"))) { - free(programmer_param); - programmer_param = NULL; - } - if (!programmer_param) - programmer_param = strdup("parallel,lpc,fwh,spi"); + bustext = extract_param(&programmer_param, "bus", ",:"); + msg_pdbg("Requested buses are: %s\n", bustext ? bustext : "default"); + if (!bustext) + bustext = strdup("parallel+lpc+fwh+spi"); /* Convert the parameters to lowercase. */ - for (i = 0; programmer_param[i] != '\0'; i++) - programmer_param[i] = - (char)tolower((unsigned char)programmer_param[i]); + tolower_string(bustext); buses_supported = CHIP_BUSTYPE_NONE; - if (strstr(programmer_param, "parallel")) { + if (strstr(bustext, "parallel")) { buses_supported |= CHIP_BUSTYPE_PARALLEL; msg_pdbg("Enabling support for %s flash.\n", "parallel"); } - if (strstr(programmer_param, "lpc")) { + if (strstr(bustext, "lpc")) { buses_supported |= CHIP_BUSTYPE_LPC; msg_pdbg("Enabling support for %s flash.\n", "LPC"); } - if (strstr(programmer_param, "fwh")) { + if (strstr(bustext, "fwh")) { buses_supported |= CHIP_BUSTYPE_FWH; msg_pdbg("Enabling support for %s flash.\n", "FWH"); } - if (strstr(programmer_param, "spi")) { + if (strstr(bustext, "spi")) { buses_supported |= CHIP_BUSTYPE_SPI; spi_controller = SPI_CONTROLLER_DUMMY; msg_pdbg("Enabling support for %s flash.\n", "SPI"); } if (buses_supported == CHIP_BUSTYPE_NONE) msg_pdbg("Support for all flash bus types disabled.\n"); - free(programmer_param); + free(bustext); return 0; } Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/flash.h Tue Jul 6 11:55:48 2010 (r1070) @@ -336,7 +336,7 @@ const char *device_name; }; uint32_t pcidev_validate(struct pci_dev *dev, uint32_t bar, const struct pcidev_status *devs); -uint32_t pcidev_init(uint16_t vendor_id, uint32_t bar, const struct pcidev_status *devs, char *pcidev_bdf); +uint32_t pcidev_init(uint16_t vendor_id, uint32_t bar, const struct pcidev_status *devs); #endif /* print.c */ Modified: trunk/flashrom.8 ============================================================================== --- trunk/flashrom.8 Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/flashrom.8 Tue Jul 6 11:55:48 2010 (r1070) @@ -183,7 +183,7 @@ .BR "* ft2232_spi" " (for SPI flash ROMs attached to a FT2232H/FT4232H based\ USB SPI programmer)" .sp -.BR "* serprog" " (for flash ROMs attached to Urja's AVR programmer)" +.BR "* serprog" " (for flash ROMs attached to a programmer speaking serprog)" .sp .BR "* buspirate_spi" " (for SPI flash ROMs attached to a Bus Pirate)" .sp @@ -296,22 +296,23 @@ .BR "dummy " programmer An optional parameter specifies the bus types it should support. For that you have to use the -.B "flashrom \-p dummy:type" +.B "flashrom \-p dummy:bus=[type[+type[+type]]]" syntax where .B type -can be any comma-separated combination of -.BR parallel ", " lpc ", " fwh ", " spi ", or " all -(in any order). +can be any of +.BR parallel ", " lpc ", " fwh ", " spi +in any order. If you specify bus without type, all buses will be disabled. +If you do not specify bus, all buses will be enabled. .sp Example: -.B "flashrom \-p dummy:lpc,fwh" +.B "flashrom \-p dummy:bus=lpc+fwh" .TP .BR "nic3com" , " nicrealtek" , " nicsmc1211" , " 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 -.BR "flashrom \-p xxxx:bb:dd.f" , +.BR "flashrom \-p xxxx:pci=bb:dd.f" , where .B xxxx is the name of the programmer @@ -323,7 +324,7 @@ is the PCI function number of the desired device. .sp Example: -.B "flashrom \-p nic3com:05:04.0" +.B "flashrom \-p nic3com:pci=05:04.0" .TP .BR "it87spi " programmer An optional @@ -342,7 +343,7 @@ An optional parameter specifies the controller type and interface/port it should support. For that you have to use the .sp -.B " flashrom \-p ft2232_spi:model,port=interface" +.B " flashrom \-p ft2232_spi:type=model,port=interface" .sp syntax where .B model @@ -363,11 +364,11 @@ programmer. In the device/baud combination, the device has to start with a slash. For serial, you have to use the .sp -.B " flashrom \-p serprog:/dev/device:baud" +.B " flashrom \-p serprog:dev=/dev/device:baud" .sp syntax and for IP, you have to use .sp -.B " flashrom \-p serprog:ip:port" +.B " flashrom \-p serprog:ip=ipaddr:port" .sp instead. More information about serprog is available in .B serprog-protocol.txt Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/flashrom.c Tue Jul 6 11:55:48 2010 (r1070) @@ -434,6 +434,7 @@ int programmer_init(char *param) { + int ret; /* Initialize all programmer specific data. */ /* Default to unlimited decode sizes. */ max_rom_decode = (const struct decode_sizes) { @@ -456,7 +457,13 @@ programmer_param = param; msg_pdbg("Initializing %s programmer\n", programmer_table[programmer].name); - return programmer_table[programmer].init(); + ret = programmer_table[programmer].init(); + if (programmer_param && strlen(programmer_param)) { + msg_perr("Unhandled programmer parameters: %s\n", + programmer_param); + /* Do not error out here, the init itself was successful. */ + } + return ret; } int programmer_shutdown(void) @@ -564,22 +571,24 @@ char *strcat_realloc(char *dest, const char *src) { dest = realloc(dest, strlen(dest) + strlen(src) + 1); - if (!dest) + if (!dest) { + msg_gerr("Out of memory!\n"); return NULL; + } strcat(dest, src); return dest; } /* This is a somewhat hacked function similar in some ways to strtok(). - * It will look for needle in haystack, return a copy of needle and remove - * everything from the first occurrence of needle to the next delimiter - * from haystack. + * It will look for needle with a subsequent '=' in haystack, return a copy of + * needle and remove everything from the first occurrence of needle to the next + * delimiter from haystack. */ char *extract_param(char **haystack, char *needle, char *delim) { - char *param_pos, *rest, *tmp; - char *dev = NULL; - int devlen; + char *param_pos, *opt_pos, *rest; + char *opt = NULL; + int optlen; int needlelen; needlelen = strlen(needle); @@ -595,43 +604,41 @@ do { if (!param_pos) return NULL; - /* Beginning of the string? */ - if (param_pos == *haystack) - break; - /* After a delimiter? */ - if (strchr(delim, *(param_pos - 1))) - break; + /* Needle followed by '='? */ + if (param_pos[needlelen] == '=') { + + /* Beginning of the string? */ + if (param_pos == *haystack) + break; + /* After a delimiter? */ + if (strchr(delim, *(param_pos - 1))) + break; + } /* Continue searching. */ param_pos++; param_pos = strstr(param_pos, needle); } while (1); - + if (param_pos) { - param_pos += strlen(needle); - devlen = strcspn(param_pos, delim); - if (devlen) { - dev = malloc(devlen + 1); - if (!dev) { - msg_gerr("Out of memory!\n"); - exit(1); - } - strncpy(dev, param_pos, devlen); - dev[devlen] = '\0'; - } - rest = param_pos + devlen; - rest += strspn(rest, delim); - param_pos -= strlen(needle); - memmove(param_pos, rest, strlen(rest) + 1); - tmp = realloc(*haystack, strlen(*haystack) + 1); - if (!tmp) { + /* Get the string after needle and '='. */ + opt_pos = param_pos + needlelen + 1; + optlen = strcspn(opt_pos, delim); + /* Return an empty string if the parameter was empty. */ + opt = malloc(optlen + 1); + if (!opt) { msg_gerr("Out of memory!\n"); exit(1); } - *haystack = tmp; + strncpy(opt, opt_pos, optlen); + opt[optlen] = '\0'; + rest = opt_pos + optlen; + /* Skip all delimiters after the current parameter. */ + rest += strspn(rest, delim); + memmove(param_pos, rest, strlen(rest) + 1); + /* We could shrink haystack, but the effort is not worth it. */ } - - return dev; + return opt; } /* start is an offset to the base address of the flash chip */ Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/ft2232_spi.c Tue Jul 6 11:55:48 2010 (r1070) @@ -76,46 +76,49 @@ int f; struct ftdi_context *ftdic = &ftdic_context; unsigned char buf[512]; - char *portpos = NULL; int ft2232_type = FTDI_FT4232H; enum ftdi_interface ft2232_interface = INTERFACE_B; + char *arg; - if (ftdi_init(ftdic) < 0) { - msg_perr("ftdi_init failed\n"); - return EXIT_FAILURE; // TODO - } - - if (programmer_param && !strlen(programmer_param)) { - free(programmer_param); - programmer_param = NULL; - } - if (programmer_param) { - if (strstr(programmer_param, "2232")) + arg = extract_param(&programmer_param, "type", ",:"); + if (arg) { + if (!strcasecmp(arg, "2232H")) ft2232_type = FTDI_FT2232H; - if (strstr(programmer_param, "4232")) + else if (!strcasecmp(arg, "4232H")) ft2232_type = FTDI_FT4232H; - portpos = strstr(programmer_param, "port="); - if (portpos) { - portpos += 5; - switch (toupper(*portpos)) { - case 'A': - ft2232_interface = INTERFACE_A; - break; - case 'B': - ft2232_interface = INTERFACE_B; - break; - default: - msg_perr("Invalid interface specified, " - "using default.\n"); - } + else { + msg_perr("Error: Invalid device type specified.\n"); + free(arg); + return 1; } - free(programmer_param); } + free(arg); + arg = extract_param(&programmer_param, "port", ",:"); + if (arg) { + switch (toupper(*arg)) { + case 'A': + ft2232_interface = INTERFACE_A; + break; + case 'B': + ft2232_interface = INTERFACE_B; + break; + default: + msg_perr("Error: Invalid port/interface specified.\n"); + free(arg); + return 1; + } + } + free(arg); msg_pdbg("Using device type %s ", (ft2232_type == FTDI_FT2232H) ? "2232H" : "4232H"); msg_pdbg("interface %s\n", (ft2232_interface == INTERFACE_A) ? "A" : "B"); + if (ftdi_init(ftdic) < 0) { + msg_perr("ftdi_init failed\n"); + return EXIT_FAILURE; // TODO + } + f = ftdi_usb_open(ftdic, 0x0403, ft2232_type); if (f < 0 && f != -5) { Modified: trunk/gfxnvidia.c ============================================================================== --- trunk/gfxnvidia.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/gfxnvidia.c Tue Jul 6 11:55:48 2010 (r1070) @@ -62,7 +62,8 @@ get_io_perms(); io_base_addr = pcidev_init(PCI_VENDOR_ID_NVIDIA, PCI_BASE_ADDRESS_0, - gfx_nvidia, programmer_param); + gfx_nvidia); + io_base_addr += 0x300000; msg_pinfo("Detected NVIDIA I/O base address: 0x%x.\n", io_base_addr); @@ -87,7 +88,6 @@ reg32 |= (1 << 0); pci_write_long(pcidev_dev, 0x50, reg32); - free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/internal.c Tue Jul 6 11:55:48 2010 (r1070) @@ -121,36 +121,45 @@ int force_laptop = 0; char *arg; - arg = extract_param(&programmer_param, "boardenable=", ",:"); + arg = extract_param(&programmer_param, "boardenable", ",:"); if (arg && !strcmp(arg,"force")) { force_boardenable = 1; } else if (arg && !strlen(arg)) { msg_perr("Missing argument for boardenable.\n"); + free(arg); + return 1; } else if (arg) { msg_perr("Unknown argument for boardenable: %s\n", arg); - exit(1); + free(arg); + return 1; } free(arg); - arg = extract_param(&programmer_param, "boardmismatch=", ",:"); + arg = extract_param(&programmer_param, "boardmismatch", ",:"); if (arg && !strcmp(arg,"force")) { force_boardmismatch = 1; } else if (arg && !strlen(arg)) { msg_perr("Missing argument for boardmismatch.\n"); + free(arg); + return 1; } else if (arg) { msg_perr("Unknown argument for boardmismatch: %s\n", arg); - exit(1); + free(arg); + return 1; } free(arg); - arg = extract_param(&programmer_param, "laptop=", ",:"); + arg = extract_param(&programmer_param, "laptop", ",:"); if (arg && !strcmp(arg,"force_I_want_a_brick")) { force_laptop = 1; } else if (arg && !strlen(arg)) { msg_perr("Missing argument for laptop.\n"); + free(arg); + return 1; } else if (arg) { msg_perr("Unknown argument for laptop: %s\n", arg); - exit(1); + free(arg); + return 1; } free(arg); Modified: trunk/it87spi.c ============================================================================== --- trunk/it87spi.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/it87spi.c Tue Jul 6 11:55:48 2010 (r1070) @@ -142,22 +142,24 @@ flashport = sio_read(port, 0x64) << 8; flashport |= sio_read(port, 0x65); msg_pdbg("Serial flash port 0x%04x\n", flashport); - if (programmer_param && !strlen(programmer_param)) { - free(programmer_param); - programmer_param = NULL; - } - if (programmer_param) { - portpos = extract_param(&programmer_param, - "it87spiport=", ",:"); - if (portpos) { - flashport = strtol(portpos, (char **)NULL, 0); - msg_pinfo("Forcing serial flash port 0x%04x\n", - flashport); - sio_write(port, 0x64, (flashport >> 8)); - sio_write(port, 0x65, (flashport & 0xff)); - free(portpos); - } + /* Non-default port requested? */ + portpos = extract_param(&programmer_param, "it87spiport", ",:"); + if (portpos && strlen(portpos)) { + flashport = strtol(portpos, (char **)NULL, 0); + msg_pinfo("Forcing serial flash port 0x%04x\n", + flashport); + sio_write(port, 0x64, (flashport >> 8)); + sio_write(port, 0x65, (flashport & 0xff)); + } else if (portpos) { + msg_perr("Error: it87spiport specified, but no port " + "given.\n"); + free(portpos); + /* FIXME: Return failure here once it87spi_common_init() + * can handle the return value sanely. + */ + exit(1); } + free(portpos); exit_conf_mode_ite(port); break; /* TODO: Handle more IT87xx if they support flash translation */ Modified: trunk/nic3com.c ============================================================================== --- trunk/nic3com.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/nic3com.c Tue Jul 6 11:55:48 2010 (r1070) @@ -59,7 +59,8 @@ get_io_perms(); io_base_addr = pcidev_init(PCI_VENDOR_ID_3COM, PCI_BASE_ADDRESS_0, - nics_3com, programmer_param); + nics_3com); + id = pcidev_dev->device_id; /* 3COM 3C90xB cards need a special fixup. */ @@ -96,7 +97,6 @@ OUTL(internal_conf, io_base_addr + INTERNAL_CONFIG); } - free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Modified: trunk/nicnatsemi.c ============================================================================== --- trunk/nicnatsemi.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/nicnatsemi.c Tue Jul 6 11:55:48 2010 (r1070) @@ -39,7 +39,7 @@ get_io_perms(); io_base_addr = pcidev_init(PCI_VENDOR_ID_NATSEMI, PCI_BASE_ADDRESS_0, - nics_natsemi, programmer_param); + nics_natsemi); buses_supported = CHIP_BUSTYPE_PARALLEL; @@ -48,7 +48,6 @@ int nicnatsemi_shutdown(void) { - free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Modified: trunk/nicrealtek.c ============================================================================== --- trunk/nicrealtek.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/nicrealtek.c Tue Jul 6 11:55:48 2010 (r1070) @@ -44,7 +44,7 @@ get_io_perms(); io_base_addr = pcidev_init(PCI_VENDOR_ID_REALTEK, PCI_BASE_ADDRESS_0, - nics_realtek, programmer_param); + nics_realtek); buses_supported = CHIP_BUSTYPE_PARALLEL; @@ -56,7 +56,7 @@ get_io_perms(); io_base_addr = pcidev_init(PCI_VENDOR_ID_SMC1211, PCI_BASE_ADDRESS_0, - nics_realteksmc1211, programmer_param); + nics_realteksmc1211); buses_supported = CHIP_BUSTYPE_PARALLEL; @@ -66,7 +66,6 @@ int nicrealtek_shutdown(void) { /* FIXME: We forgot to disable software access again. */ - free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Modified: trunk/pcidev.c ============================================================================== --- trunk/pcidev.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/pcidev.c Tue Jul 6 11:55:48 2010 (r1070) @@ -78,10 +78,11 @@ } uint32_t pcidev_init(uint16_t vendor_id, uint32_t bar, - const struct pcidev_status *devs, char *pcidev_bdf) + const struct pcidev_status *devs) { struct pci_dev *dev; struct pci_filter filter; + char *pcidev_bdf; char *msg = NULL; int found = 0; uint32_t addr = 0, curaddr = 0; @@ -93,12 +94,14 @@ /* Filter by vendor and also bb:dd.f (if supplied by the user). */ filter.vendor = vendor_id; + pcidev_bdf = extract_param(&programmer_param, "pci", ","); if (pcidev_bdf != NULL) { if ((msg = pci_filter_parse_slot(&filter, pcidev_bdf))) { msg_perr("Error: %s\n", msg); exit(1); } } + free(pcidev_bdf); for (dev = pacc->devices; dev; dev = dev->next) { if (pci_filter_match(&filter, dev)) { Modified: trunk/satasii.c ============================================================================== --- trunk/satasii.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/satasii.c Tue Jul 6 11:55:48 2010 (r1070) @@ -46,8 +46,8 @@ get_io_perms(); - pcidev_init(PCI_VENDOR_ID_SII, PCI_BASE_ADDRESS_0, satas_sii, - programmer_param); + pcidev_init(PCI_VENDOR_ID_SII, PCI_BASE_ADDRESS_0, satas_sii); + id = pcidev_dev->device_id; if ((id == 0x3132) || (id == 0x3124)) { @@ -71,7 +71,6 @@ int satasii_shutdown(void) { - free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Sat Jul 3 14:14:25 2010 (r1069) +++ trunk/serprog.c Tue Jul 6 11:55:48 2010 (r1070) @@ -298,43 +298,80 @@ int serprog_init(void) { uint16_t iface; - int len; unsigned char pgmname[17]; unsigned char rbuf[3]; unsigned char c; - char *num; - char *dev; - msg_pspew("%s\n", __func__); - /* the parameter is either of format "/dev/device:baud" or "ip:port" */ - if ((!programmer_param) || (!strlen(programmer_param))) { - nodevice: - msg_perr("Error: No device/host given for the serial programmer driver.\n" - "Use flashrom -p serprog=/dev/device:baud or flashrom -p serprog=ip:port\n"); - exit(1); - } - num = strstr(programmer_param, ":"); - len = num - programmer_param; - if (!len) goto nodevice; - if (!num) { - msg_perr("Error: No port or baudrate specified to serial programmer driver.\n" - "Use flashrom -p serprog=/dev/device:baud or flashrom -p serprog=ip:port\n"); - exit(1); - } - len = num - programmer_param; - dev = malloc(len + 1); - if (!dev) sp_die("Error: memory allocation failure"); - memcpy(dev, programmer_param, len); - dev[len] = 0; - num = strdup(num + 1); - if (!num) sp_die("Error: memory allocation failure"); - free(programmer_param); - programmer_param = NULL; + char *device; + char *baudport; + int have_device = 0; - if (dev[0] == '/') sp_fd = sp_openserport(dev, atoi(num)); - else sp_fd = sp_opensocket(dev, atoi(num)); + /* the parameter is either of format "dev=/dev/device:baud" or "ip=ip:port" */ + device = extract_param(&programmer_param, "dev", ","); + if (device && strlen(device)) { + baudport = strstr(device, ":"); + if (baudport) { + /* Split device from baudrate. */ + *baudport = '\0'; + baudport++; + } + if (!baudport || !strlen(baudport)) { + msg_perr("Error: No baudrate specified.\n" + "Use flashrom -p serprog:dev=/dev/device:baud\n"); + free(device); + return 1; + } + if (strlen(device)) { + sp_fd = sp_openserport(device, atoi(baudport)); + have_device++; + } + } + if (device && !strlen(device)) { + msg_perr("Error: No device specified.\n" + "Use flashrom -p serprog:dev=/dev/device:baud\n"); + free(device); + return 1; + } + free(device); - free(dev); dev = NULL; - free(num); num = NULL; + device = extract_param(&programmer_param, "ip", ","); + if (have_device && device) { + msg_perr("Error: Both host and device specified.\n" + "Please use either dev= or ip= but not both.\n"); + free(device); + return 1; + } + if (device && strlen(device)) { + baudport = strstr(device, ":"); + if (baudport) { + /* Split host from port. */ + *baudport = '\0'; + baudport++; + } + if (!baudport || !strlen(baudport)) { + msg_perr("Error: No port specified.\n" + "Use flashrom -p serprog:ip=ipaddr:port\n"); + free(device); + return 1; + } + if (strlen(device)) { + sp_fd = sp_opensocket(device, atoi(baudport)); + have_device++; + } + } + if (device && !strlen(device)) { + msg_perr("Error: No host specified.\n" + "Use flashrom -p serprog:ip=ipaddr:port\n"); + free(device); + return 1; + } + free(device); + + if (!have_device) { + msg_perr("Error: Neither host nor device specified.\n" + "Use flashrom -p serprog:dev=/dev/device:baud or " + "flashrom -p serprog:ip=ipaddr:port\n"); + return 1; + } msg_pdbg(MSGHEADER "connected - attempting to synchronize\n");

1 0

[RFC] Uppercase or lowercase hexadecimal numbers?
by Carl-Daniel Hailfinger 05 Jul '10

05 Jul '10

Hi, right now our tree has a mix of lowercase and uppercase hexadecimal numbers. I don't plan to change them all (we have enough changes already), but I'd like to know which variant I should use for future patches. My personal favourite is lowercase hex (don't need to hit shift that way), but I don't know what you prefer. Regards, Carl-Daniel -- http://www.hailfinger.org/

3 2

(no subject)
by Vitaliy Buchynskyy 04 Jul '10

04 Jul '10

flashrom v0.9.2-r1001 on Linux 2.6.33.5-124.fc13.x86_64 (x86_64), built with libpci 3.1.6, GCC 4.4.4 20100503 (Red Hat 4.4.4-2) flashrom is free software, get the source code at http://www.flashrom.org Initializing internal programmer No coreboot table found. DMI string system-manufacturer: "BIOSTAR Group" DMI string system-product-name: "NF61D-A2" DMI string system-version: "1.0" DMI string baseboard-manufacturer: "BIOSTAR Group" DMI string baseboard-product-name: "NF61D-A2" DMI string baseboard-version: "1.0" DMI string chassis-type: "Desktop" Found ITE Super I/O, id 8716 Found chipset "NVIDIA MCP61", enabling flash write... This chipset is not really supported yet. Guesswork... ISA/LPC bridge reg 0x8a contents: 0x00, bit 6 is 0, bit 5 is 0 Guessed flash bus type is LPC Found SMBus device 10de:03eb at 00:01:1 SPI BAR is at 0xfec80000, after clearing low bits BAR is at 0xfec80000 Strange. MCP SPI BAR is valid, but chipset apparently doesn't have SPI enabled. Please send the output of "flashrom -V" to flashrom(a)flashrom.org to help us finish support for your chipset. Thanks. OK. This chipset supports the following protocols: LPC. No IT87* serial flash segment enabled. Calibrating delay loop... 699M loops per second, 10 myus = 11 us, 100 myus = 100 us, 1000 myus = 1008 us, 10000 myus = 10010 us, OK. Probing for AMD Am29F010A/B, 128 KB: skipped. Probing for AMD Am29F002(N)BB, 256 KB: skipped. Probing for AMD Am29F002(N)BT, 256 KB: skipped. Probing for AMD Am29F016D, 2048 KB: skipped. Probing for AMD Am29F040B, 512 KB: skipped. Probing for AMD Am29F080B, 1024 KB: skipped. Probing for AMD Am29LV040B, 512 KB: skipped. Probing for AMD Am29LV081B, 1024 KB: skipped. Probing for ASD AE49F2008, 256 KB: skipped. Probing for Atmel AT25DF021, 256 KB: skipped. Probing for Atmel AT25DF041A, 512 KB: skipped. Probing for Atmel AT25DF081, 1024 KB: skipped. Probing for Atmel AT25DF161, 2048 KB: skipped. Probing for Atmel AT25DF321, 4096 KB: skipped. Probing for Atmel AT25DF321A, 4096 KB: skipped. Probing for Atmel AT25DF641, 8192 KB: skipped. Probing for Atmel AT25F512B, 64 KB: skipped. Probing for Atmel AT25FS010, 128 KB: skipped. Probing for Atmel AT25FS040, 512 KB: skipped. Probing for Atmel AT26DF041, 512 KB: skipped. Probing for Atmel AT26DF081A, 1024 KB: skipped. Probing for Atmel AT26DF161, 2048 KB: skipped. Probing for Atmel AT26DF161A, 2048 KB: skipped. Probing for Atmel AT26F004, 512 KB: skipped. Probing for Atmel AT29C512, 64 KB: skipped. Probing for Atmel AT29C010A, 128 KB: skipped. Probing for Atmel AT29C020, 256 KB: skipped. Probing for Atmel AT29C040A, 512 KB: skipped. Probing for Atmel AT45CS1282, 16896 KB: skipped. Probing for Atmel AT45DB011D, 128 KB: skipped. Probing for Atmel AT45DB021D, 256 KB: skipped. Probing for Atmel AT45DB041D, 512 KB: skipped. Probing for Atmel AT45DB081D, 1024 KB: skipped. Probing for Atmel AT45DB161D, 2048 KB: skipped. Probing for Atmel AT45DB321C, 4224 KB: skipped. Probing for Atmel AT45DB321D, 4096 KB: skipped. Probing for Atmel AT45DB642D, 8192 KB: skipped. Probing for Atmel AT49BV512, 64 KB: skipped. Probing for Atmel AT49F002(N), 256 KB: skipped. Probing for Atmel AT49F002(N)T, 256 KB: skipped. Probing for AMIC A25L40PT, 512 KB: skipped. Probing for AMIC A25L40PU, 512 KB: skipped. Probing for AMIC A29002B, 256 KB: skipped. Probing for AMIC A29002T, 256 KB: skipped. Probing for AMIC A29040B, 512 KB: skipped. Probing for AMIC A49LF040A, 512 KB: probe_jedec_common: id1 0x37, id2 0x9d Found chip "AMIC A49LF040A" (512 KB, LPC) at physical address 0xfff80000. Probing for EMST F49B002UA, 256 KB: skipped. Probing for Eon EN25B05, 64 KB: skipped. Probing for Eon EN25B05T, 64 KB: skipped. Probing for Eon EN25B10, 128 KB: skipped. Probing for Eon EN25B10T, 128 KB: skipped. Probing for Eon EN25B20, 256 KB: skipped. Probing for Eon EN25B20T, 256 KB: skipped. Probing for Eon EN25B40, 512 KB: skipped. Probing for Eon EN25B40T, 512 KB: skipped. Probing for Eon EN25B80, 1024 KB: skipped. Probing for Eon EN25B80T, 1024 KB: skipped. Probing for Eon EN25B16, 2048 KB: skipped. Probing for Eon EN25B16T, 2048 KB: skipped. Probing for Eon EN25B32, 4096 KB: skipped. Probing for Eon EN25B32T, 4096 KB: skipped. Probing for Eon EN25B64, 8192 KB: skipped. Probing for Eon EN25B64T, 8192 KB: skipped. Probing for Eon EN25D16, 2048 KB: skipped. Probing for Eon EN25F05, 64 KB: skipped. Probing for Eon EN25F10, 128 KB: skipped. Probing for Eon EN25F20, 256 KB: skipped. Probing for Eon EN25F40, 512 KB: skipped. Probing for Eon EN25F80, 1024 KB: skipped. Probing for Eon EN25F16, 2048 KB: skipped. Probing for Eon EN25F32, 4096 KB: skipped. Probing for Eon EN29F010, 128 KB: skipped. Probing for EON EN29F002(A)(N)B, 256 KB: skipped. Probing for EON EN29F002(A)(N)T, 256 KB: skipped. Probing for Fujitsu MBM29F004BC, 512 KB: skipped. Probing for Fujitsu MBM29F004TC, 512 KB: skipped. Probing for Fujitsu MBM29F400BC, 512 KB: skipped. Probing for Fujitsu MBM29F400TC, 512 KB: skipped. Probing for Intel 28F001BX-B, 128 KB: skipped. Probing for Intel 28F001BX-T, 128 KB: skipped. Probing for Intel 28F004S5, 512 KB: skipped. Probing for Intel 28F004BV/BE-B, 512 KB: skipped. Probing for Intel 28F004BV/BE-T, 512 KB: skipped. Probing for Intel 28F400BV/CV/CE-B, 512 KB: skipped. Probing for Intel 28F400BV/CV/CE-T, 512 KB: skipped. Probing for Intel 82802AB, 512 KB: skipped. Probing for Intel 82802AC, 1024 KB: skipped. Probing for Macronix MX25L512, 64 KB: skipped. Probing for Macronix MX25L1005, 128 KB: skipped. Probing for Macronix MX25L2005, 256 KB: skipped. Probing for Macronix MX25L4005, 512 KB: skipped. Probing for Macronix MX25L8005, 1024 KB: skipped. Probing for Macronix MX25L1605, 2048 KB: skipped. Probing for Macronix MX25L1635D, 2048 KB: skipped. Probing for Macronix MX25L3205, 4096 KB: skipped. Probing for Macronix MX25L3235D, 4096 KB: skipped. Probing for Macronix MX25L6405, 8192 KB: skipped. Probing for Macronix MX25L12805, 16384 KB: skipped. Probing for Macronix MX29F001B, 128 KB: skipped. Probing for Macronix MX29F001T, 128 KB: skipped. Probing for Macronix MX29F002B, 256 KB: skipped. Probing for Macronix MX29F002T, 256 KB: skipped. Probing for Macronix MX29LV040, 512 KB: skipped. Probing for Numonyx M25PE10, 128 KB: skipped. Probing for Numonyx M25PE20, 256 KB: skipped. Probing for Numonyx M25PE40, 512 KB: skipped. Probing for Numonyx M25PE80, 1024 KB: skipped. Probing for Numonyx M25PE16, 2048 KB: skipped. Probing for PMC Pm25LV010, 128 KB: skipped. Probing for PMC Pm25LV016B, 2048 KB: skipped. Probing for PMC Pm25LV020, 256 KB: skipped. Probing for PMC Pm25LV040, 512 KB: skipped. Probing for PMC Pm25LV080B, 1024 KB: skipped. Probing for PMC Pm25LV512, 64 KB: skipped. Probing for PMC Pm29F002T, 256 KB: skipped. Probing for PMC Pm29F002B, 256 KB: skipped. Probing for PMC Pm39LV010, 128 KB: skipped. Probing for PMC Pm39LV020, 256 KB: skipped. Probing for PMC Pm39LV040, 512 KB: skipped. Probing for PMC Pm49FL002, 256 KB: probe_jedec_common: id1 0x37, id2 0x9d Probing for PMC Pm49FL004, 512 KB: probe_jedec_common: id1 0x37, id2 0x9d Probing for Sanyo LF25FW203A, 2048 KB: skipped. Probing for Sharp LHF00L04, 1024 KB: skipped. Probing for Spansion S25FL008A, 1024 KB: skipped. Probing for Spansion S25FL016A, 2048 KB: skipped. Probing for SST SST25VF016B, 2048 KB: skipped. Probing for SST SST25VF032B, 4096 KB: skipped. Probing for SST SST25VF040.REMS, 512 KB: skipped. Probing for SST SST25VF040B, 512 KB: skipped. Probing for SST SST25VF040B.REMS, 512 KB: skipped. Probing for SST SST25VF080B, 1024 KB: skipped. Probing for SST SST28SF040A, 512 KB: skipped. Probing for SST SST29EE010, 128 KB: skipped. Probing for SST SST29LE010, 128 KB: skipped. Probing for SST SST29EE020A, 256 KB: skipped. Probing for SST SST29LE020, 256 KB: skipped. Probing for SST SST39SF512, 64 KB: skipped. Probing for SST SST39SF010A, 128 KB: skipped. Probing for SST SST39SF020A, 256 KB: skipped. Probing for SST SST39SF040, 512 KB: skipped. Probing for SST SST39VF512, 64 KB: skipped. Probing for SST SST39VF010, 128 KB: skipped. Probing for SST SST39VF020, 256 KB: skipped. Probing for SST SST39VF040, 512 KB: skipped. Probing for SST SST39VF080, 1024 KB: skipped. Probing for SST SST49LF002A/B, 256 KB: skipped. Probing for SST SST49LF003A/B, 384 KB: skipped. Probing for SST SST49LF004A/B, 512 KB: skipped. Probing for SST SST49LF004C, 512 KB: skipped. Probing for SST SST49LF008A, 1024 KB: skipped. Probing for SST SST49LF008C, 1024 KB: skipped. Probing for SST SST49LF016C, 2048 KB: skipped. Probing for SST SST49LF020, 256 KB: probe_jedec_common: id1 0x37, id2 0x9d Probing for SST SST49LF020A, 256 KB: probe_jedec_common: id1 0x37, id2 0x9d Probing for SST SST49LF040, 512 KB: probe_jedec_common: id1 0x37, id2 0x9d Probing for SST SST49LF040B, 512 KB: probe_jedec_common: id1 0x37, id2 0x9d Probing for SST SST49LF080A, 1024 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF160C, 2048 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M25P05-A, 64 KB: skipped. Probing for ST M25P05.RES, 64 KB: skipped. Probing for ST M25P10-A, 128 KB: skipped. Probing for ST M25P10.RES, 128 KB: skipped. Probing for ST M25P20, 256 KB: skipped. Probing for ST M25P40, 512 KB: skipped. Probing for ST M25P40-old, 512 KB: skipped. Probing for ST M25P80, 1024 KB: skipped. Probing for ST M25P16, 2048 KB: skipped. Probing for ST M25P32, 4096 KB: skipped. Probing for ST M25P64, 8192 KB: skipped. Probing for ST M25P128, 16384 KB: skipped. Probing for ST M29F002B, 256 KB: skipped. Probing for ST M29F002T/NT, 256 KB: skipped. Probing for ST M29F040B, 512 KB: skipped. Probing for ST M29F400BT, 512 KB: skipped. Probing for ST M29W010B, 128 KB: skipped. Probing for ST M29W040B, 512 KB: skipped. Probing for ST M29W512B, 64 KB: skipped. Probing for ST M50FLW040A, 512 KB: probe_82802ab: id1 0x49, id2 0x4d, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040B, 512 KB: probe_82802ab: id1 0x49, id2 0x4d, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080A, 1024 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080B, 1024 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW002, 256 KB: skipped. Probing for ST M50FW016, 2048 KB: skipped. Probing for ST M50FW040, 512 KB: skipped. Probing for ST M50FW080, 1024 KB: skipped. Probing for ST M50LPW116, 2048 KB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS S29C31004T, 512 KB: skipped. Probing for SyncMOS S29C51001T, 128 KB: skipped. Probing for SyncMOS S29C51002T, 256 KB: skipped. Probing for SyncMOS S29C51004T, 512 KB: skipped. Probing for TI TMS29F002RB, 256 KB: skipped. Probing for TI TMS29F002RT, 256 KB: skipped. Probing for Winbond W25Q80, 1024 KB: skipped. Probing for Winbond W25Q16, 2048 KB: skipped. Probing for Winbond W25Q32, 4096 KB: skipped. Probing for Winbond W25x10, 128 KB: skipped. Probing for Winbond W25x20, 256 KB: skipped. Probing for Winbond W25x40, 512 KB: skipped. Probing for Winbond W25x80, 1024 KB: skipped. Probing for Winbond W25x16, 2048 KB: skipped. Probing for Winbond W25x32, 4096 KB: skipped. Probing for Winbond W25x64, 8192 KB: skipped. Probing for Winbond W29C011, 128 KB: skipped. Probing for Winbond W29C020C, 256 KB: skipped. Probing for Winbond W29C040P, 512 KB: skipped. Probing for Winbond W29EE011, 128 KB: skipped. Probing for Winbond W39V040A, 512 KB: probe_jedec_common: id1 0x37, id2 0x9d Probing for Winbond W39V040B, 512 KB: probe_jedec_common: id1 0x37, id2 0x9d Probing for Winbond W39V040C, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0x37, id2 0x9d Probing for Winbond W39V040FA, 512 KB: skipped. Probing for Winbond W39V080A, 1024 KB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W49F002U, 256 KB: skipped. Probing for Winbond W49V002A, 256 KB: probe_jedec_common: id1 0x37, id2 0x9d Probing for Winbond W49V002FA, 256 KB: skipped. Probing for Winbond W39V080FA, 1024 KB: skipped. Probing for Winbond W39V080FA (dual mode), 512 KB: skipped. Probing for Atmel unknown Atmel SPI chip, 0 KB: skipped. Probing for EON unknown EON SPI chip, 0 KB: skipped. Probing for Macronix unknown Macronix SPI chip, 0 KB: skipped. Probing for PMC unknown PMC SPI chip, 0 KB: skipped. Probing for SST unknown SST SPI chip, 0 KB: skipped. Probing for ST unknown ST SPI chip, 0 KB: skipped. Probing for Sanyo unknown Sanyo SPI chip, 0 KB: skipped. Probing for Generic unknown SPI chip (RDID), 0 KB: skipped. Probing for Generic unknown SPI chip (REMS), 0 KB: skipped. === This flash part has status UNTESTED for operations: PROBE READ ERASE WRITE The test status of this chip may have been updated in the latest development version of flashrom. If you are running the latest development version, please email a report to flashrom(a)flashrom.org if any of the above operations work correctly for you with this flash part. Please include the flashrom output with the additional -V option for all operations you tested (-V, -Vr, -Vw, -VE), and mention which mainboard or programmer you tested. Thanks for your help! === -- CONFIDENTIALITY NOTICE: This e-mail message is intended only for the person or entity to which it is addressed and may contain confidential and/or privileged material. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply e-mail and destroy all copies of the original message. If you are the intended recipient but do not wish to receive communications through this medium, please so advise the sender immediately.

2 2

Request to move Paraflasher from coreboot to flashrom
by Joseph Smith 04 Jul '10

04 Jul '10

Hello, As some of you may know I have been doing some work recently on the Paraflasher project. I would like to get the wiki page: http://www.coreboot.org/Paraflasher moved over from the coreboot wiki to the flashrom wiki. Could someone do that for me? -- Thanks, Joseph Smith Set-Top-Linux www.settoplinux.org

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom July 2010