- flashrom - mail.coreboot.org

[commit] r1073 - trunk
by repository service 10 Jul '10

10 Jul '10

Author: hailfinger Date: Sat Jul 10 18:56:32 2010 New Revision: 1073 URL: http://flashrom.org/trac/coreboot/changeset/1073 Log: Autodetect the ITE IT8705 Super I/O and enable flash writes if it performs LPC->Parallel translation. Remove board enables which triggered the IT8705 write enable manually. Change the IT87 SPI special case to cover IT87 LPC->SPI and LPC->Parallel translation. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Tested on Syntax SV266A. Acked-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Tested on Shuttle AK38N, all operations work fine. Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/board_enable.c trunk/flash.h trunk/internal.c trunk/it87spi.c Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Thu Jul 8 12:13:37 2010 (r1072) +++ trunk/board_enable.c Sat Jul 10 18:56:32 2010 (r1073) @@ -390,31 +390,92 @@ } /** - * + * Suited for all boards with ITE IT8705F. + * The SIS950 Super I/O probably requires a similar flash write enable. */ -static int it8705f_write_enable(uint8_t port) +int it8705f_write_enable(uint8_t port) { + uint8_t tmp; + int ret = 0; + enter_conf_mode_ite(port); - sio_mask(port, 0x24, 0x04, 0x04); /* Flash ROM I/F Writes Enable */ + tmp = sio_read(port, 0x24); + /* Check if at least one flash segment is enabled. */ + if (tmp & 0xf0) { + /* The IT8705F will respond to LPC cycles and translate them. */ + buses_supported = CHIP_BUSTYPE_PARALLEL; + /* Flash ROM I/F Writes Enable */ + tmp |= 0x04; + msg_pdbg("Enabling IT8705F flash ROM interface write.\n"); + if (tmp & 0x02) { + /* The data sheet contradicts itself about max size. */ + max_rom_decode.parallel = 1024 * 1024; + msg_pinfo("IT8705F with very unusual settings. Please " + "send the output of \"flashrom -V\" to \n" + "flashrom(a)flashrom.org to help us finish " + "support for your Super I/O. Thanks.\n"); + ret = 1; + } else if (tmp & 0x08) { + max_rom_decode.parallel = 512 * 1024; + } else { + max_rom_decode.parallel = 256 * 1024; + } + /* Safety checks. The data sheet is unclear here: Segments 1+3 + * overlap, no segment seems to cover top - 1MB to top - 512kB. + * We assume that certain combinations make no sense. + */ + if (((tmp & 0x02) && !(tmp & 0x08)) || /* 1 MB en, 512 kB dis */ + (!(tmp & 0x10)) || /* 128 kB dis */ + (!(tmp & 0x40))) { /* 256/512 kB dis */ + msg_perr("Inconsistent IT8705F decode size!\n"); + ret = 1; + } + if (sio_read(port, 0x25) != 0) { + msg_perr("IT8705F flash data pins disabled!\n"); + ret = 1; + } + if (sio_read(port, 0x26) != 0) { + msg_perr("IT8705F flash address pins 0-7 disabled!\n"); + ret = 1; + } + if (sio_read(port, 0x27) != 0) { + msg_perr("IT8705F flash address pins 8-15 disabled!\n"); + ret = 1; + } + if ((sio_read(port, 0x29) & 0x10) != 0) { + msg_perr("IT8705F flash write enable pin disabled!\n"); + ret = 1; + } + if ((sio_read(port, 0x29) & 0x08) != 0) { + msg_perr("IT8705F flash chip select pin disabled!\n"); + ret = 1; + } + if ((sio_read(port, 0x29) & 0x04) != 0) { + msg_perr("IT8705F flash read strobe pin disabled!\n"); + ret = 1; + } + if ((sio_read(port, 0x29) & 0x03) != 0) { + msg_perr("IT8705F flash address pins 16-17 disabled!\n"); + /* Not really an error if you use flash chips smaller + * than 256 kByte, but such a configuration is unlikely. + */ + ret = 1; + } + msg_pdbg("Maximum IT8705F parallel flash decode size is %u.\n", + max_rom_decode.parallel); + if (ret) { + msg_pinfo("Not enabling IT8705F flash write.\n"); + } else { + sio_write(port, 0x24, tmp); + } + } else { + msg_pdbg("No IT8705F flash segment enabled.\n"); + /* Not sure if this is an error or not. */ + ret = 0; + } exit_conf_mode_ite(port); - return 0; -} - -/** - * Suited for: - * - AOpen vKM400Am-S: VIA KM400 + VT8237 + IT8705F. - * - Biostar P4M80-M4: VIA P4M800 + VT8237 + IT8705AF - * - Elitegroup K7S6A: SiS745 + ITE IT8705F - * - Elitegroup K7VTA3: VIA Apollo KT266/A/333 + VIA VT8235 + ITE IT8705F - * - GIGABYTE GA-7VT600: VIA KT600 + VT8237 + IT8705 - * - Shuttle AK38N: VIA KT333CF + VIA VT8235 + ITE IT8705F - * - * The SIS950 Super I/O probably requires the same flash write enable. - */ -static int it8705f_write_enable_2e(void) -{ - return it8705f_write_enable(0x2e); + return ret; } static int pc87360_gpio_set(uint8_t gpio, int raise) @@ -1590,7 +1651,6 @@ {0x105a, 0x0d30, 0x105a, 0x4d33, 0x8086, 0x1130, 0x8086, 0, NULL, NULL, NULL, "Acorp", "6A815EPD", 0, OK, board_acorp_6a815epd}, {0x1022, 0x746B, 0, 0, 0, 0, 0, 0, NULL, "AGAMI", "ARUMA", "agami", "Aruma", 0, OK, w83627hf_gpio24_raise_2e}, {0x1106, 0x3177, 0x17F2, 0x3177, 0x1106, 0x3148, 0x17F2, 0x3148, NULL, NULL, NULL, "Albatron", "PM266A Pro", 0, OK, w836xx_memw_enable_2e}, - {0x1106, 0x3205, 0x1106, 0x3205, 0x10EC, 0x8139, 0xA0A0, 0x0477, NULL, NULL, NULL, "AOpen", "vKM400Am-S", 0, OK, it8705f_write_enable_2e}, {0x1022, 0x2090, 0, 0, 0x1022, 0x2080, 0, 0, NULL, "artecgroup", "dbe61", "Artec Group", "DBE61", 0, OK, board_artecgroup_dbe6x}, {0x1022, 0x2090, 0, 0, 0x1022, 0x2080, 0, 0, NULL, "artecgroup", "dbe62", "Artec Group", "DBE62", 0, OK, board_artecgroup_dbe6x}, {0x8086, 0x24D4, 0x1849, 0x24D0, 0x8086, 0x24D5, 0x1849, 0x9739, NULL, NULL, NULL, "ASRock", "P4i65GV", 0, OK, intel_ich_gpio23_raise}, @@ -1611,14 +1671,11 @@ {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}, - {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}, - {0x1106, 0x3038, 0x1019, 0x0996, 0x1106, 0x3177, 0x1019, 0x0996, NULL, NULL, NULL, "Elitegroup", "K7VTA3", 256, OK, it8705f_write_enable_2e}, + {0x1106, 0x3038, 0x1019, 0x0996, 0x1106, 0x3177, 0x1019, 0x0996, NULL, NULL, NULL, "Elitegroup", "K7VTA3", 256, OK, NULL}, {0x1106, 0x3177, 0x1106, 0x3177, 0x1106, 0x3059, 0x1695, 0x3005, NULL, NULL, NULL, "EPoX", "EP-8K5A2", 0, OK, w836xx_memw_enable_2e}, {0x10EC, 0x8139, 0x1695, 0x9001, 0x11C1, 0x5811, 0x1695, 0x9015, NULL, NULL, NULL, "EPoX", "EP-8RDA3+", 0, OK, nvidia_mcp_gpio31_raise}, {0x8086, 0x7110, 0, 0, 0x8086, 0x7190, 0, 0, NULL, "epox", "ep-bx3", "EPoX", "EP-BX3", 0, OK, board_epox_ep_bx3}, - {0x1106, 0x3227, 0x1458, 0x5001, 0x10ec, 0x8139, 0x1458, 0xe000, NULL, NULL, NULL, "GIGABYTE", "GA-7VT600", 0, OK, it8705f_write_enable_2e}, {0x1106, 0x0686, 0x1106, 0x0686, 0x1106, 0x3058, 0x1458, 0xa000, NULL, NULL, NULL, "GIGABYTE", "GA-7ZM", 512, OK, NULL}, {0x10DE, 0x0050, 0x1458, 0x0C11, 0x10DE, 0x005e, 0x1458, 0x5000, NULL, NULL, NULL, "GIGABYTE", "GA-K8N-SLI", 0, OK, nvidia_mcp_gpio21_raise}, {0x1166, 0x0223, 0x103c, 0x320d, 0x14e4, 0x1678, 0x103c, 0x703e, NULL, "hp", "dl145_g3", "HP", "DL145 G3", 0, OK, board_hp_dl145_g3_enable}, @@ -1644,7 +1701,7 @@ {0x10DE, 0x0270, 0x1462, 0x7207, 0x10DE, 0x0264, 0x1462, 0x7207, NULL, NULL, NULL, "MSI", "MS-7207 (K8N GM2-L)", 0, NT, nvidia_mcp_gpio2_raise}, {0x1011, 0x0019, 0xaa55, 0xaa55, 0x8086, 0x7190, 0, 0, NULL, NULL, NULL, "Nokia", "IP530", 0, OK, fdc37b787_gpio50_raise_3f0}, {0x1106, 0x3099, 0, 0, 0x1106, 0x3074, 0, 0, NULL, "shuttle", "ak31", "Shuttle", "AK31", 0, OK, w836xx_memw_enable_2e}, - {0x1106, 0x3104, 0x1297, 0xa238, 0x1106, 0x3059, 0x1297, 0xc063, NULL, NULL, NULL, "Shuttle", "AK38N", 256, OK, it8705f_write_enable_2e}, + {0x1106, 0x3104, 0x1297, 0xa238, 0x1106, 0x3059, 0x1297, 0xc063, NULL, NULL, NULL, "Shuttle", "AK38N", 256, OK, NULL}, {0x10DE, 0x0050, 0x1297, 0x5036, 0x1412, 0x1724, 0x1297, 0x5036, NULL, NULL, NULL, "Shuttle", "FN25", 0, OK, board_shuttle_fn25}, {0x1106, 0x3038, 0x0925, 0x1234, 0x1106, 0x3058, 0x15DD, 0x7609, NULL, NULL, NULL, "Soyo", "SY-7VCA", 0, OK, via_apollo_gpo0_lower}, {0x1106, 0x3038, 0x0925, 0x1234, 0x1106, 0x0596, 0x1106, 0, NULL, NULL, NULL, "Tekram", "P6Pro-A5", 256, OK, NULL}, Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Thu Jul 8 12:13:37 2010 (r1072) +++ trunk/flash.h Sat Jul 10 18:56:32 2010 (r1073) @@ -350,6 +350,7 @@ /* board_enable.c */ void w836xx_ext_enter(uint16_t port); void w836xx_ext_leave(uint16_t port); +int it8705f_write_enable(uint8_t port); uint8_t sio_read(uint16_t port, uint8_t reg); void sio_write(uint16_t port, uint8_t reg, uint8_t data); void sio_mask(uint16_t port, uint8_t reg, uint8_t data, uint8_t mask); @@ -692,12 +693,11 @@ int ich_spi_send_multicommand(struct spi_command *cmds); /* it87spi.c */ -extern uint16_t it8716f_flashport; void enter_conf_mode_ite(uint16_t port); void exit_conf_mode_ite(uint16_t port); struct superio probe_superio_ite(void); +int init_superio_ite(void); int it87spi_init(void); -int it87xx_probe_spi_flash(const char *name); int it8716f_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len); Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Thu Jul 8 12:13:37 2010 (r1072) +++ trunk/internal.c Sat Jul 10 18:56:32 2010 (r1073) @@ -229,8 +229,10 @@ } #if defined(__i386__) || defined(__x86_64__) - /* Probe for IT87* LPC->SPI translation unconditionally. */ - it87xx_probe_spi_flash(NULL); + /* Probe unconditionally for IT87* LPC->SPI translation and for + * IT87* Parallel write enable. + */ + init_superio_ite(); #endif board_flash_enable(lb_vendor, lb_part); Modified: trunk/it87spi.c ============================================================================== --- trunk/it87spi.c Thu Jul 8 12:13:37 2010 (r1072) +++ trunk/it87spi.c Sat Jul 10 18:56:32 2010 (r1073) @@ -96,90 +96,109 @@ return ret; } -static uint16_t find_ite_spi_flash_port(uint16_t port, uint16_t id) +static uint16_t it87spi_probe(uint16_t port) { uint8_t tmp = 0; char *portpos = NULL; uint16_t flashport = 0; - switch (id) { - case 0x8716: - case 0x8718: - case 0x8720: - enter_conf_mode_ite(port); - /* NOLDN, reg 0x24, mask out lowest bit (suspend) */ - tmp = sio_read(port, 0x24) & 0xFE; - /* If IT87SPI was not explicitly selected, we want to check - * quickly if LPC->SPI translation is active. - */ - if ((programmer == PROGRAMMER_INTERNAL) && !(tmp & (0x0E))) { - msg_pdbg("No IT87* serial flash segment enabled.\n"); - exit_conf_mode_ite(port); - break; - } - msg_pdbg("Serial flash segment 0x%08x-0x%08x %sabled\n", - 0xFFFE0000, 0xFFFFFFFF, (tmp & 1 << 1) ? "en" : "dis"); - msg_pdbg("Serial flash segment 0x%08x-0x%08x %sabled\n", - 0x000E0000, 0x000FFFFF, (tmp & 1 << 1) ? "en" : "dis"); - msg_pdbg("Serial flash segment 0x%08x-0x%08x %sabled\n", - 0xFFEE0000, 0xFFEFFFFF, (tmp & 1 << 2) ? "en" : "dis"); - msg_pdbg("Serial flash segment 0x%08x-0x%08x %sabled\n", - 0xFFF80000, 0xFFFEFFFF, (tmp & 1 << 3) ? "en" : "dis"); - msg_pdbg("LPC write to serial flash %sabled\n", - (tmp & 1 << 4) ? "en" : "dis"); - /* The LPC->SPI force write enable below only makes sense for - * non-programmer mode. + enter_conf_mode_ite(port); + /* NOLDN, reg 0x24, mask out lowest bit (suspend) */ + tmp = sio_read(port, 0x24) & 0xFE; + /* If IT87SPI was not explicitly selected, we want to check + * quickly if LPC->SPI translation is active. + */ + if ((programmer == PROGRAMMER_INTERNAL) && !(tmp & (0x0E))) { + msg_pdbg("No IT87* serial flash segment enabled.\n"); + exit_conf_mode_ite(port); + /* Nothing to do. */ + return 1; + } + msg_pdbg("Serial flash segment 0x%08x-0x%08x %sabled\n", + 0xFFFE0000, 0xFFFFFFFF, (tmp & 1 << 1) ? "en" : "dis"); + msg_pdbg("Serial flash segment 0x%08x-0x%08x %sabled\n", + 0x000E0000, 0x000FFFFF, (tmp & 1 << 1) ? "en" : "dis"); + msg_pdbg("Serial flash segment 0x%08x-0x%08x %sabled\n", + 0xFFEE0000, 0xFFEFFFFF, (tmp & 1 << 2) ? "en" : "dis"); + msg_pdbg("Serial flash segment 0x%08x-0x%08x %sabled\n", + 0xFFF80000, 0xFFFEFFFF, (tmp & 1 << 3) ? "en" : "dis"); + msg_pdbg("LPC write to serial flash %sabled\n", + (tmp & 1 << 4) ? "en" : "dis"); + /* The LPC->SPI force write enable below only makes sense for + * non-programmer mode. + */ + /* If any serial flash segment is enabled, enable writing. */ + if ((tmp & 0xe) && (!(tmp & 1 << 4))) { + msg_pdbg("Enabling LPC write to serial flash\n"); + tmp |= 1 << 4; + sio_write(port, 0x24, tmp); + } + msg_pdbg("Serial flash pin %i\n", (tmp & 1 << 5) ? 87 : 29); + /* LDN 0x7, reg 0x64/0x65 */ + sio_write(port, 0x07, 0x7); + flashport = sio_read(port, 0x64) << 8; + flashport |= sio_read(port, 0x65); + msg_pdbg("Serial flash port 0x%04x\n", flashport); + /* Non-default port requested? */ + portpos = extract_programmer_param("it87spiport"); + if (portpos) { + char *endptr = NULL; + unsigned long forced_flashport; + forced_flashport = strtoul(portpos, &endptr, 0); + /* Port 0, port >0x1000, unaligned ports and garbage strings + * are rejected. */ - /* If any serial flash segment is enabled, enable writing. */ - if ((tmp & 0xe) && (!(tmp & 1 << 4))) { - msg_pdbg("Enabling LPC write to serial flash\n"); - tmp |= 1 << 4; - sio_write(port, 0x24, tmp); - } - msg_pdbg("Serial flash pin %i\n", (tmp & 1 << 5) ? 87 : 29); - /* LDN 0x7, reg 0x64/0x65 */ - sio_write(port, 0x07, 0x7); - flashport = sio_read(port, 0x64) << 8; - flashport |= sio_read(port, 0x65); - msg_pdbg("Serial flash port 0x%04x\n", flashport); - /* Non-default port requested? */ - portpos = extract_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"); + if (!forced_flashport || (forced_flashport >= 0x1000) || + (forced_flashport & 0x7) || (*endptr != '\0')) { + /* Using ports below 0x100 is a really bad idea, and + * should only be done if no port between 0x100 and + * 0xff8 works due to routing issues. + */ + msg_perr("Error: it87spiport specified, but no valid " + "port specified.\nPort must be a multiple of " + "0x8 and lie between 0x100 and 0xff8.\n"); free(portpos); /* FIXME: Return failure here once it87spi_common_init() * can handle the return value sanely. */ exit(1); + } else { + flashport = (uint16_t)forced_flashport; + msg_pinfo("Forcing serial flash port 0x%04x\n", + flashport); + sio_write(port, 0x64, (flashport >> 8)); + sio_write(port, 0x65, (flashport & 0xff)); } - free(portpos); - exit_conf_mode_ite(port); - break; - /* TODO: Handle more IT87xx if they support flash translation */ - default: - msg_pdbg("SuperI/O ID %04hx is not on the controller list.\n", id); } - return flashport; + free(portpos); + exit_conf_mode_ite(port); + it8716f_flashport = flashport; + if (buses_supported & CHIP_BUSTYPE_SPI) + msg_pdbg("Overriding chipset SPI with IT87 SPI.\n"); + spi_controller = SPI_CONTROLLER_IT87XX; + buses_supported |= CHIP_BUSTYPE_SPI; + return 0; } -int it87spi_common_init(void) +int init_superio_ite(void) { if (superio.vendor != SUPERIO_VENDOR_ITE) return 1; - it8716f_flashport = find_ite_spi_flash_port(superio.port, superio.model); - - if (it8716f_flashport) - spi_controller = SPI_CONTROLLER_IT87XX; - - return (!it8716f_flashport); + switch (superio.model) { + case 0x8705: + return it8705f_write_enable(superio.port); + break; + case 0x8716: + case 0x8718: + case 0x8720: + return it87spi_probe(superio.port); + break; + default: + msg_pdbg("Super I/O ID 0x%04hx is not on the list of flash " + "capable controllers.\n", superio.model); + } + return 1; } @@ -190,7 +209,7 @@ get_io_perms(); /* Probe for the Super I/O chip and fill global struct superio. */ probe_superio(); - ret = it87spi_common_init(); + ret = init_superio_ite(); if (!ret) { buses_supported = CHIP_BUSTYPE_SPI; } else { @@ -198,19 +217,6 @@ } return ret; } - -int it87xx_probe_spi_flash(const char *name) -{ - int ret; - - ret = it87spi_common_init(); - if (!ret) { - if (buses_supported & CHIP_BUSTYPE_SPI) - msg_pdbg("Overriding chipset SPI with IT87 SPI.\n"); - buses_supported |= CHIP_BUSTYPE_SPI; - } - return ret; -} /* * The IT8716F only supports commands with length 1,2,4,5 bytes including

1 0

test of Winbond W25Q80BV
by Jonathan A. Kollasch 10 Jul '10

10 Jul '10

Hi, I've tested a Winbond W25Q80BV (W25Q80BVDAIG/25Q80BVAIG) socketed on a Asus M4A87TD/USB3. Read, erase, write and verify worked fine. Attached is flashrom -V output. Jonathan Kollasch

1 0

[PATCH] Check if spi25 block protection could be disabled
by Carl-Daniel Hailfinger 09 Jul '10

09 Jul '10

Check if disabling the block protection on generic SPI chips works and complain otherwise. This patch will also appear at the top of http://patchwork.coreboot.org/project/flashrom/list/ arunkumarm, please download latest flashrom (at least r1072) from subversion: svn co svn://coreboot.org/flashrom/trunk flashrom and then apply this patch and try to write again in verbose mode. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-spi25_disable_blockprotect_check/spi25.c =================================================================== --- flashrom-spi25_disable_blockprotect_check/spi25.c (Revision 1072) +++ flashrom-spi25_disable_blockprotect_check/spi25.c (Arbeitskopie) @@ -855,6 +855,11 @@ msg_cerr("spi_write_status_register failed\n"); return result; } + status = spi_read_status_register(); + if ((status & 0x3c) != 0) { + msg_cerr("Block protection could not be disabled!\n"); + /* Should we error out here? */ + } } return 0; } -- http://www.hailfinger.org/

1 0

[PATCH] Add chip definitions for Mosel Vitelic
by Mattias Mattsson 09 Jul '10

09 Jul '10

Add definitions for the following chips from Mosel Vitelic Corporation: V29C31004B V29C31004T V29C51000B V29C51000T V29C51001B V29C51001T V29C51002B V29C51002T V29C51004B V29C51004T V29C51400B V29C51400T V29LC51000 V29LC51001 V29LC51002 This is one of my first patches ever so I am not at all certain it is correct. Datasheets here: http://www.ezoflash.com/datasheets/flash/Mosel_Vitelic/V29C31004.pdf http://www.ezoflash.com/datasheets/flash/Mosel_Vitelic/V29C51000.pdf http://www.ezoflash.com/datasheets/flash/Mosel_Vitelic/V29C51001.pdf http://www.ezoflash.com/datasheets/flash/Mosel_Vitelic/V29C51002.pdf http://www.ezoflash.com/datasheets/flash/Mosel_Vitelic/V29C51004.pdf http://www.ezoflash.com/datasheets/flash/Mosel_Vitelic/V29C51400.pdf http://www.ezoflash.com/datasheets/flash/Mosel_Vitelic/V29LC51000.pdf http://www.ezoflash.com/datasheets/flash/Mosel_Vitelic/V29LC51001.pdf http://www.ezoflash.com/datasheets/flash/Mosel_Vitelic/V29LC51002.pdf Signed-off-by: Mattias Mattsson <vitplister(a)gmail.com> Index: flashrom/flashchips.c =================================================================== --- flashrom.orig/flashchips.c 2010-07-09 11:07:44.000000000 +0200 +++ flashrom/flashchips.c 2010-07-09 11:08:01.000000000 +0200 @@ -3166,6 +3166,422 @@ }, { + .vendor = "Mosel Vitelic", + .name = "V29C31004B", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29C31004B, + .total_size = 512, + .page_size = 1024, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 1024, 512}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Mosel Vitelic", + .name = "V29C31004T", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29C31004T, + .total_size = 512, + .page_size = 1024, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 1024, 512}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Mosel Vitelic", + .name = "V29C51000B", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29C51000B, + .total_size = 64, + .page_size = 512, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 512, 128}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {128 * 512, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Mosel Vitelic", + .name = "V29C51000T", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29C51000T, + .total_size = 64, + .page_size = 512, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 512, 128}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {128 * 512, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Mosel Vitelic", + .name = "V29C51001B", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29C51001B, + .total_size = 128, + .page_size = 512, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 512, 256}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {256 * 512, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Mosel Vitelic", + .name = "V29C51001T", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29C51001T, + .total_size = 128, + .page_size = 512, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 512, 256}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {256 * 512, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Mosel Vitelic", + .name = "V29C51002B", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29C51002B, + .total_size = 256, + .page_size = 512, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 512, 512}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {512 * 512, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Mosel Vitelic", + .name = "V29C51002T", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29C51002T, + .total_size = 256, + .page_size = 512, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 512, 512}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {512 * 512, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Mosel Vitelic", + .name = "V29C51004B", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29C51004B, + .total_size = 512, + .page_size = 1024, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 1024, 512}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Mosel Vitelic", + .name = "V29C51004T", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29C51004T, + .total_size = 512, + .page_size = 1024, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 1024, 512}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Mosel Vitelic", + .name = "V29C51400B", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29C51400B, + .total_size = 512, + .page_size = 1024, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 1024, 512}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Mosel Vitelic", + .name = "V29C51400T", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29C51400T, + .total_size = 512, + .page_size = 1024, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 1024, 512}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Mosel Vitelic", + .name = "V29C51400T", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29C51400T, + .total_size = 512, + .page_size = 1024, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 1024, 512}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Mosel Vitelic", + .name = "V29LC51000", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29LC51000, + .total_size = 64, + .page_size = 512, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 512, 128}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {128 * 512, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Mosel Vitelic", + .name = "V29LC51001", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29LC51001, + .total_size = 128, + .page_size = 512, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 512, 256}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {256 * 512, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Mosel Vitelic", + .name = "V29LC51002", + .bustype = CHIP_BUSTYPE_PARALLEL, + .manufacture_id = MVC_ID, + .model_id = MVC_V29LC51002, + .total_size = 256, + .page_size = 512, + .feature_bits = FEATURE_BYTEWRITES | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {1 * 512, 512}, }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {512 * 512, 1} }, + .block_erase = erase_chip_block_jedec, + }, + }, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { .vendor = "Numonyx", .name = "M25PE10", .bustype = CHIP_BUSTYPE_SPI, Index: flashrom/flashchips.h =================================================================== --- flashrom.orig/flashchips.h 2010-07-09 11:07:44.000000000 +0200 +++ flashrom/flashchips.h 2010-07-09 11:08:01.000000000 +0200 @@ -329,6 +329,23 @@ #define MX_29SL800CB 0x6B /* Same as MX29SL802CB */ #define MX_29SL800CT 0xEA /* Same as MX29SL802CT */ +#define MVC_ID 0x40 /* Mosel Vitelic Corp. / SyncMOS */ +#define MVC_V29C31004B 0x73 +#define MVC_V29C31004T 0x63 /* Same as S29C31004T */ +#define MVC_V29C51000B 0xA0 +#define MVC_V29C51000T 0x00 +#define MVC_V29C51001B 0xA1 +#define MVC_V29C51001T 0x01 /* Same as S29C51001T */ +#define MVC_V29C51002B 0xA2 +#define MVC_V29C51002T 0x02 /* Same as S29C51002T */ +#define MVC_V29C51004B 0xA3 +#define MVC_V29C51004T 0x03 /* Same as S29C51004T */ +#define MVC_V29C51400B 0xB3 +#define MVC_V29C51400T 0x13 +#define MVC_V29LC51000 0x20 +#define MVC_V29LC51001 0x60 +#define MVC_V29LC51002 0x82 + /* * Programmable Micro Corp is listed in JEP106W in bank 2, so it should * have a 0x7F continuation code prefix.

2 1

[Fwd: imac mcp79] MCP SPI
by david 09 Jul '10

09 Jul '10

1 0

imac mcp79
by david 09 Jul '10

09 Jul '10

According to system profiler and benchmark the bios is version IM91.88Z.008D.B08.0904271717 and the board name is Mac-F2218EA9. I could'nt find a bios update file, but i did flashrom -r and the output is here,http://members.iinet.net.au/~dledson/backup.bin i don't know if it works though.

1 0

[PATCH][NOTFORMERGE] Only flash the first 0xf0000 bytes on MX25L8005/ICH8
by Carl-Daniel Hailfinger 09 Jul '10

09 Jul '10

This patch is for the laptop of apricot053 on IRC. Here is the log of the failed write: flashrom v0.9.1-r946 No coreboot table found. DMI string system-manufacturer: "Hewlett-Packard" DMI string system-product-name: "HP Compaq 6820s" DMI string system-version: "F.0B" DMI string baseboard-manufacturer: "Hewlett-Packard" DMI string baseboard-product-name: "30D7" DMI string baseboard-version: "KBC Version 83.13" DMI string chassis-type: "Notebook" Laptop detected via DMI ======================================================================== WARNING! You seem to be running flashrom on a laptop. Laptops, notebooks and netbooks are difficult to support and we recommend to use the vendor flashing utility. The embedded controller (EC) in these machines often interacts badly with flashing. See http://www.flashrom.org/Laptops for details. ======================================================================== Found chipset "Intel ICH8M", enabling flash write... 0xfff80000/0xffb80000 FWH IDSEL: 0x0 0xfff00000/0xffb00000 FWH IDSEL: 0x0 0xffe80000/0xffa80000 FWH IDSEL: 0x1 0xffe00000/0xffa00000 FWH IDSEL: 0x1 0xffd80000/0xff980000 FWH IDSEL: 0x2 0xffd00000/0xff900000 FWH IDSEL: 0x2 0xffc80000/0xff880000 FWH IDSEL: 0x3 0xffc00000/0xff800000 FWH IDSEL: 0x3 0xff700000/0xff300000 FWH IDSEL: 0x4 0xff600000/0xff200000 FWH IDSEL: 0x5 0xff500000/0xff100000 FWH IDSEL: 0x6 0xff400000/0xff000000 FWH IDSEL: 0x7 0xfff80000/0xffb80000 FWH decode enabled 0xfff00000/0xffb00000 FWH decode enabled 0xffe80000/0xffa80000 FWH decode disabled 0xffe00000/0xffa00000 FWH decode disabled 0xffd80000/0xff980000 FWH decode disabled 0xffd00000/0xff900000 FWH decode disabled 0xffc80000/0xff880000 FWH decode disabled 0xffc00000/0xff800000 FWH decode disabled 0xff700000/0xff300000 FWH decode disabled 0xff600000/0xff200000 FWH decode disabled 0xff500000/0xff100000 FWH decode disabled 0xff400000/0xff000000 FWH decode disabled Maximum FWH chip size: 0x100000 bytes BIOS Lock Enable: disabled, BIOS Write Enable: enabled, BIOS_CNTL is 0x1 Root Complex Register Block address = 0xfed90000 GCS = 0x460: BIOS Interface Lock-Down: disabled, BOOT BIOS Straps: 0x1 (SPI) Top Swap : not enabled SPIBAR = 0xfed90000 + 0x3020 0x04: 0xe008 (HSFS) FLOCKDN 1, FDV 1, FDOPSS 1, SCIP 0, BERASE 1, AEL 0, FCERR 0, FDONE 0 0x50: 0x0000ffff (FRAP) BMWAG 0, BMRAG 0, BRWA 255, BRRA 255 0x54: 0x00000000 (FREG0) 0x58: 0x00ff0003 (FREG1) 0x5C: 0x00000fff (FREG2) 0x60: 0x00020001 (FREG3) 0x64: 0x00000000 (FREG4) 0x74: 0x80ff00f0 (PR0) 0x78: 0x00000000 (PR1) 0x7C: 0x00000000 (PR2) 0x80: 0x00000000 (PR3) 0x84: 0x00000000 (PR4) 0x90: 0x007f1004 (SSFS, SSFC) 0x94: 0x5006 (PREOP) 0x96: 0x7f48 (OPTYPE) 0x98: 0x0405039f (OPMENU) 0x9C: 0x0102d820 (OPMENU+4) 0xA0: 0x00000000 (BBAR) 0xB0: 0x00000000 (FDOC) WARNING: SPI Configuration Lockdown activated. Generating OPCODES... done SPI Read Configuration: prefetching disabled, caching enabled, OK. This chipset supports the following protocols: FWH,SPI. Calibrating delay loop... 619M loops per second, 100 myus = 209 us. OK. Probing for AMD Am29F010A/B, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for AMD Am29F002(N)BB, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for AMD Am29F002(N)BT, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for AMD Am29F016D, 2048 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for AMD Am29F040B, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for AMD Am29F080B, 1024 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for AMD Am29LV040B, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for AMD Am29LV081B, 1024 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for ASD AE49F2008, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Atmel AT25DF021, 256 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25DF041A, 512 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25DF081, 1024 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25DF161, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25DF321, 4096 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25DF321A, 4096 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25DF641, 8192 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25F512B, 64 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25FS010, 128 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT25FS040, 512 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT26DF041, 512 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT26DF081A, 1024 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT26DF161, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT26DF161A, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT26F004, 512 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT29C512, 64 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Atmel AT29C010A, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Atmel AT29C020, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Atmel AT29C040A, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Atmel AT45CS1282, 16896 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB011D, 128 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB021D, 256 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB041D, 512 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB081D, 1024 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB161D, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB321C, 4224 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB321D, 4096 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT45DB642D, 8192 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Atmel AT49BV512, 64 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Atmel AT49F002(N), 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Atmel AT49F002(N)T, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for AMIC A25L40PT, 512 KB: RDID returned 0xc2 0x20 0x14 0xc2. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A25L40PU, 512 KB: RDID returned 0xc2 0x20 0x14 0xc2. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for AMIC A29002B, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for AMIC A29002T, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for AMIC A29040B, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for AMIC A49LF040A, 512 KB: skipped. Host bus type FWH,SPI and chip bus type LPC are incompatible. Probing for EMST F49B002UA, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Eon EN25B05, 64 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B05T, 64 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B10, 128 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B10T, 128 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B20, 256 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B20T, 256 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B40, 512 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B40T, 512 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B80, 1024 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B80T, 1024 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B16, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B16T, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B32, 4096 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B32T, 4096 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B64, 8192 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25B64T, 8192 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25D16, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25F05, 64 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25F10, 128 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25F20, 256 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25F40, 512 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25F80, 1024 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25F16, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN25F32, 4096 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Eon EN29F010, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for EON EN29F002(A)(N)B, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for EON EN29F002(A)(N)T, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Fujitsu MBM29F004BC, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Fujitsu MBM29F004TC, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Fujitsu MBM29F400BC, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Fujitsu MBM29F400TC, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Intel 28F001BX-B, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Intel 28F001BX-T, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Intel 28F004S5, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Intel 82802AB, 512 KB: probe_82802ab: id1 0x02, id2 0x37 Probing for Intel 82802AC, 1024 KB: probe_82802ab: id1 0xff, id2 0xff Probing for Macronix MX25L512, 64 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L1005, 128 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L2005, 256 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L4005, 512 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L8005, 1024 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Chip status register is 00 Chip status register: Status Register Write Disable (SRWD) is not set Chip status register: Bit 6 is not set Chip status register: Bit 5 / Block Protect 3 (BP3) is not set Chip status register: Bit 4 / Block Protect 2 (BP2) is not set Chip status register: Bit 3 / Block Protect 1 (BP1) is not set Chip status register: Bit 2 / Block Protect 0 (BP0) is not set Chip status register: Write Enable Latch (WEL) is not set Chip status register: Write In Progress (WIP/BUSY) is not set Found chip "Macronix MX25L8005" (1024 KB, SPI) at physical address 0xfff00000. Probing for Macronix MX25L1605, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L1635D, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L3205, 4096 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L3235D, 4096 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L6405, 8192 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX25L12805, 16384 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Macronix MX29F001B, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Macronix MX29F001T, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Macronix MX29F002B, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Macronix MX29F002T, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Macronix MX29LV040, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Numonyx M25PE10, 128 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Numonyx M25PE20, 256 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Numonyx M25PE40, 512 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Numonyx M25PE80, 1024 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Numonyx M25PE16, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for PMC Pm25LV010, 128 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for PMC Pm25LV016B, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for PMC Pm25LV020, 256 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for PMC Pm25LV040, 512 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for PMC Pm25LV080B, 1024 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for PMC Pm25LV512, 64 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for PMC Pm29F002T, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for PMC Pm29F002B, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for PMC Pm39LV010, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for PMC Pm49FL002, 256 KB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm49FL004, 512 KB: probe_jedec_common: id1 0x02, id2 0x37, id1 is normal flash content, id2 is normal flash content Probing for Sanyo LF25FW203A, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Sharp LHF00L04, 1024 KB: probe_82802ab: id1 0xff, id2 0xff Probing for Spansion S25FL008A, 1024 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Spansion S25FL016A, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for SST SST25VF016B, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for SST SST25VF032B, 4096 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for SST SST25VF040.REMS, 512 KB: Invalid OPCODE 0x90 Probing for SST SST25VF040B, 512 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for SST SST25VF040B.REMS, 512 KB: Invalid OPCODE 0x90 Probing for SST SST25VF080B, 1024 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for SST SST28SF040A, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SST SST29EE010, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SST SST29LE010, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SST SST29EE020A, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SST SST29LE020, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SST SST39SF512, 64 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SST SST39SF010A, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SST SST39SF020A, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SST SST39SF040, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SST SST39VF512, 64 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SST SST39VF010, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SST SST39VF020, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SST SST39VF040, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SST SST39VF080, 1024 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SST SST49LF002A/B, 256 KB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF003A/B, 384 KB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF004A/B, 512 KB: probe_jedec_common: id1 0x02, id2 0x37, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF004C, 512 KB: probe_82802ab: id1 0x02, id2 0x37 Probing for SST SST49LF008A, 1024 KB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF008C, 1024 KB: probe_82802ab: id1 0xff, id2 0xff Probing for SST SST49LF016C, 2048 KB: Chip size 2048 kB is bigger than supported size 1024 kB of chipset/board/programmer for FWH interface, probe/read/erase/write may fail. probe_82802ab: id1 0xff, id2 0xff Probing for SST SST49LF020, 256 KB: skipped. Host bus type FWH,SPI and chip bus type LPC are incompatible. Probing for SST SST49LF020A, 256 KB: skipped. Host bus type FWH,SPI and chip bus type LPC are incompatible. Probing for SST SST49LF040, 512 KB: skipped. Host bus type FWH,SPI and chip bus type LPC are incompatible. Probing for SST SST49LF040B, 512 KB: skipped. Host bus type FWH,SPI and chip bus type LPC are incompatible. Probing for SST SST49LF080A, 1024 KB: skipped. Host bus type FWH,SPI and chip bus type LPC are incompatible. Probing for SST SST49LF160C, 2048 KB: skipped. Host bus type FWH,SPI and chip bus type LPC are incompatible. Probing for ST M25P05-A, 64 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P05.RES, 64 KB: RDID returned 0xc2 0x20 0x14. Ignoring RES in favour of RDID. Probing for ST M25P10-A, 128 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P10.RES, 128 KB: RDID returned 0xc2 0x20 0x14. Ignoring RES in favour of RDID. Probing for ST M25P20, 256 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P40, 512 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P40-old, 512 KB: RDID returned 0xc2 0x20 0x14. Ignoring RES in favour of RDID. Probing for ST M25P80, 1024 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P16, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P32, 4096 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P64, 8192 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M25P128, 16384 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for ST M29F002B, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for ST M29F002T/NT, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for ST M29F040B, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for ST M29F400BT, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for ST M29W010B, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for ST M29W040B, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for ST M29W512B, 64 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for ST M50FLW040A, 512 KB: probe_82802ab: id1 0x02, id2 0x37 Probing for ST M50FLW040B, 512 KB: probe_82802ab: id1 0x02, id2 0x37 Probing for ST M50FLW080A, 1024 KB: probe_82802ab: id1 0xff, id2 0xff Probing for ST M50FLW080B, 1024 KB: probe_82802ab: id1 0xff, id2 0xff Probing for ST M50FW002, 256 KB: probe_82802ab: id1 0xff, id2 0xff Probing for ST M50FW016, 2048 KB: Chip size 2048 kB is bigger than supported size 1024 kB of chipset/board/programmer for FWH interface, probe/read/erase/write may fail. probe_82802ab: id1 0xff, id2 0xff Probing for ST M50FW040, 512 KB: probe_82802ab: id1 0x02, id2 0x37 Probing for ST M50FW080, 1024 KB: probe_82802ab: id1 0xff, id2 0xff Probing for ST M50LPW116, 2048 KB: skipped. Host bus type FWH,SPI and chip bus type LPC are incompatible. Probing for SyncMOS S29C31004T, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SyncMOS S29C51001T, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SyncMOS S29C51002T, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for SyncMOS S29C51004T, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for TI TMS29F002RB, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for TI TMS29F002RT, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Winbond W25x10, 128 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25x20, 256 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25x40, 512 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25x80, 1024 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25x16, 2048 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25x32, 4096 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W25x64, 8192 KB: RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Probing for Winbond W29C011, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Winbond W29C020C, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Winbond W29C040P, 512 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Winbond W29EE011, 128 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Winbond W39V040A, 512 KB: skipped. Host bus type FWH,SPI and chip bus type LPC are incompatible. Probing for Winbond W39V040B, 512 KB: skipped. Host bus type FWH,SPI and chip bus type LPC are incompatible. Probing for Winbond W39V040C, 512 KB: skipped. Host bus type FWH,SPI and chip bus type LPC are incompatible. Probing for Winbond W39V040FA, 512 KB: probe_jedec_common: id1 0x02, id2 0x37, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V080A, 1024 KB: skipped. Host bus type FWH,SPI and chip bus type LPC are incompatible. Probing for Winbond W49F002U, 256 KB: skipped. Host bus type FWH,SPI and chip bus type Parallel are incompatible. Probing for Winbond W49V002A, 256 KB: skipped. Host bus type FWH,SPI and chip bus type LPC are incompatible. Probing for Winbond W49V002FA, 256 KB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V080FA, 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 Winbond W39V080FA (dual mode), 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0x02, id2 0x37, id1 is normal flash content, id2 is normal flash content Probing for Atmel unknown Atmel SPI chip, 0 KB: Not mapping flash chip, zero size at 0x00000000. RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Not unmapping zero size at (nil) Probing for EON unknown EON SPI chip, 0 KB: Not mapping flash chip, zero size at 0x00000000. RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Not unmapping zero size at (nil) Probing for Macronix unknown Macronix SPI chip, 0 KB: Not mapping flash chip, zero size at 0x00000000. RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Not unmapping zero size at (nil) Probing for PMC unknown PMC SPI chip, 0 KB: Not mapping flash chip, zero size at 0x00000000. RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Not unmapping zero size at (nil) Probing for SST unknown SST SPI chip, 0 KB: Not mapping flash chip, zero size at 0x00000000. RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Not unmapping zero size at (nil) Probing for ST unknown ST SPI chip, 0 KB: Not mapping flash chip, zero size at 0x00000000. RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Not unmapping zero size at (nil) Probing for Sanyo unknown Sanyo SPI chip, 0 KB: Not mapping flash chip, zero size at 0x00000000. RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Not unmapping zero size at (nil) Probing for Generic unknown SPI chip (RDID), 0 KB: Not mapping flash chip, zero size at 0x00000000. RDID returned 0xc2 0x20 0x14. probe_spi_rdid_generic: id1 0xc2, id2 0x2014 Not unmapping zero size at (nil) Probing for Generic unknown SPI chip (REMS), 0 KB: Not mapping flash chip, zero size at 0x00000000. Invalid OPCODE 0x90 Not unmapping zero size at (nil) === This flash part has status UNTESTED for operations: ERASE 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, -rV, -wV, -EV), and mention which mainboard or programmer you tested. Thanks for your help! === Flash image seems to be a legacy BIOS. Disabling checks. Writing flash chip... Erasing flash before programming... Erasing flash chip... Looking at blockwise erase function 0... trying... 0x000000-0x000fff, 0x001000-0x001fff, 0x002000-0x002fff, 0x003000-0x003fff, 0x004000-0x004fff, 0x005000-0x005fff, 0x006000-0x006fff, 0x007000-0x007fff, 0x008000-0x008fff, 0x009000-0x009fff, 0x00a000-0x00afff, 0x00b000-0x00bfff, 0x00c000-0x00cfff, 0x00d000-0x00dfff, 0x00e000-0x00efff, 0x00f000-0x00ffff, 0x010000-0x010fff, 0x011000-0x011fff, 0x012000-0x012fff, 0x013000-0x013fff, 0x014000-0x014fff, 0x015000-0x015fff, 0x016000-0x016fff, 0x017000-0x017fff, 0x018000-0x018fff, 0x019000-0x019fff, 0x01a000-0x01afff, 0x01b000-0x01bfff, 0x01c000-0x01cfff, 0x01d000-0x01dfff, 0x01e000-0x01efff, 0x01f000-0x01ffff, 0x020000-0x020fff, 0x021000-0x021fff, 0x022000-0x022fff, 0x023000-0x023fff, 0x024000-0x024fff, 0x025000-0x025fff, 0x026000-0x026fff, 0x027000-0x027fff, 0x028000-0x028fff, 0x029000-0x029fff, 0x02a000-0x02afff, 0x02b000-0x02bfff, 0x02c000-0x02cfff, 0x02d000-0x02dfff, 0x02e000-0x02efff, 0x02f000-0x02ffff, 0x030000-0x030fff, 0x031000-0x031fff, 0x032000-0x032fff, 0x033000-0x033fff, 0x034000-0x034fff, 0x035000-0x035fff, 0x036000-0x036fff, 0x037000-0x037fff, 0x038000-0x038fff, 0x039000-0x039fff, 0x03a000-0x03afff, 0x03b000-0x03bfff, 0x03c000-0x03cfff, 0x03d000-0x03dfff, 0x03e000-0x03efff, 0x03f000-0x03ffff, 0x040000-0x040fff, 0x041000-0x041fff, 0x042000-0x042fff, 0x043000-0x043fff, 0x044000-0x044fff, 0x045000-0x045fff, 0x046000-0x046fff, 0x047000-0x047fff, 0x048000-0x048fff, 0x049000-0x049fff, 0x04a000-0x04afff, 0x04b000-0x04bfff, 0x04c000-0x04cfff, 0x04d000-0x04dfff, 0x04e000-0x04efff, 0x04f000-0x04ffff, 0x050000-0x050fff, 0x051000-0x051fff, 0x052000-0x052fff, 0x053000-0x053fff, 0x054000-0x054fff, 0x055000-0x055fff, 0x056000-0x056fff, 0x057000-0x057fff, 0x058000-0x058fff, 0x059000-0x059fff, 0x05a000-0x05afff, 0x05b000-0x05bfff, 0x05c000-0x05cfff, 0x05d000-0x05dfff, 0x05e000-0x05efff, 0x05f000-0x05ffff, 0x060000-0x060fff, 0x061000-0x061fff, 0x062000-0x062fff, 0x063000-0x063fff, 0x064000-0x064fff, 0x065000-0x065fff, 0x066000-0x066fff, 0x067000-0x067fff, 0x068000-0x068fff, 0x069000-0x069fff, 0x06a000-0x06afff, 0x06b000-0x06bfff, 0x06c000-0x06cfff, 0x06d000-0x06dfff, 0x06e000-0x06efff, 0x06f000-0x06ffff, 0x070000-0x070fff, 0x071000-0x071fff, 0x072000-0x072fff, 0x073000-0x073fff, 0x074000-0x074fff, 0x075000-0x075fff, 0x076000-0x076fff, 0x077000-0x077fff, 0x078000-0x078fff, 0x079000-0x079fff, 0x07a000-0x07afff, 0x07b000-0x07bfff, 0x07c000-0x07cfff, 0x07d000-0x07dfff, 0x07e000-0x07efff, 0x07f000-0x07ffff, 0x080000-0x080fff, 0x081000-0x081fff, 0x082000-0x082fff, 0x083000-0x083fff, 0x084000-0x084fff, 0x085000-0x085fff, 0x086000-0x086fff, 0x087000-0x087fff, 0x088000-0x088fff, 0x089000-0x089fff, 0x08a000-0x08afff, 0x08b000-0x08bfff, 0x08c000-0x08cfff, 0x08d000-0x08dfff, 0x08e000-0x08efff, 0x08f000-0x08ffff, 0x090000-0x090fff, 0x091000-0x091fff, 0x092000-0x092fff, 0x093000-0x093fff, 0x094000-0x094fff, 0x095000-0x095fff, 0x096000-0x096fff, 0x097000-0x097fff, 0x098000-0x098fff, 0x099000-0x099fff, 0x09a000-0x09afff, 0x09b000-0x09bfff, 0x09c000-0x09cfff, 0x09d000-0x09dfff, 0x09e000-0x09efff, 0x09f000-0x09ffff, 0x0a0000-0x0a0fff, 0x0a1000-0x0a1fff, 0x0a2000-0x0a2fff, 0x0a3000-0x0a3fff, 0x0a4000-0x0a4fff, 0x0a5000-0x0a5fff, 0x0a6000-0x0a6fff, 0x0a7000-0x0a7fff, 0x0a8000-0x0a8fff, 0x0a9000-0x0a9fff, 0x0aa000-0x0aafff, 0x0ab000-0x0abfff, 0x0ac000-0x0acfff, 0x0ad000-0x0adfff, 0x0ae000-0x0aefff, 0x0af000-0x0affff, 0x0b0000-0x0b0fff, 0x0b1000-0x0b1fff, 0x0b2000-0x0b2fff, 0x0b3000-0x0b3fff, 0x0b4000-0x0b4fff, 0x0b5000-0x0b5fff, 0x0b6000-0x0b6fff, 0x0b7000-0x0b7fff, 0x0b8000-0x0b8fff, 0x0b9000-0x0b9fff, 0x0ba000-0x0bafff, 0x0bb000-0x0bbfff, 0x0bc000-0x0bcfff, 0x0bd000-0x0bdfff, 0x0be000-0x0befff, 0x0bf000-0x0bffff, 0x0c0000-0x0c0fff, 0x0c1000-0x0c1fff, 0x0c2000-0x0c2fff, 0x0c3000-0x0c3fff, 0x0c4000-0x0c4fff, 0x0c5000-0x0c5fff, 0x0c6000-0x0c6fff, 0x0c7000-0x0c7fff, 0x0c8000-0x0c8fff, 0x0c9000-0x0c9fff, 0x0ca000-0x0cafff, 0x0cb000-0x0cbfff, 0x0cc000-0x0ccfff, 0x0cd000-0x0cdfff, 0x0ce000-0x0cefff, 0x0cf000-0x0cffff, 0x0d0000-0x0d0fff, 0x0d1000-0x0d1fff, 0x0d2000-0x0d2fff, 0x0d3000-0x0d3fff, 0x0d4000-0x0d4fff, 0x0d5000-0x0d5fff, 0x0d6000-0x0d6fff, 0x0d7000-0x0d7fff, 0x0d8000-0x0d8fff, 0x0d9000-0x0d9fff, 0x0da000-0x0dafff, 0x0db000-0x0dbfff, 0x0dc000-0x0dcfff, 0x0dd000-0x0ddfff, 0x0de000-0x0defff, 0x0df000-0x0dffff, 0x0e0000-0x0e0fff, 0x0e1000-0x0e1fff, 0x0e2000-0x0e2fff, 0x0e3000-0x0e3fff, 0x0e4000-0x0e4fff, 0x0e5000-0x0e5fff, 0x0e6000-0x0e6fff, 0x0e7000-0x0e7fff, 0x0e8000-0x0e8fff, 0x0e9000-0x0e9fff, 0x0ea000-0x0eafff, 0x0eb000-0x0ebfff, 0x0ec000-0x0ecfff, 0x0ed000-0x0edfff, 0x0ee000-0x0eefff, 0x0ef000-0x0effff, 0x0f0000-0x0f0fff, Transaction error! run OPCODE 0x20 failed spi_block_erase_20 failed during command execution at address 0xf0000 Looking at blockwise erase function 1... trying... 0x000000-0x00ffff, Invalid OPCODE 0x06 spi_block_erase_52 failed during command execution at address 0x0 Looking at blockwise erase function 2... trying... 0x000000-0x00ffff, 0x010000-0x01ffff, 0x020000-0x02ffff, 0x030000-0x03ffff, 0x040000-0x04ffff, 0x050000-0x05ffff, 0x060000-0x06ffff, 0x070000-0x07ffff, 0x080000-0x08ffff, 0x090000-0x09ffff, 0x0a0000-0x0affff, 0x0b0000-0x0bffff, 0x0c0000-0x0cffff, 0x0d0000-0x0dffff, 0x0e0000-0x0effff, 0x0f0000-0x0fffff, Transaction error! run OPCODE 0xd8 failed spi_block_erase_d8 failed during command execution at address 0xf0000 Looking at blockwise erase function 3... trying... 0x000000-0x0fffff, Invalid OPCODE 0x06 spi_chip_erase_60 failed during command execution Looking at blockwise erase function 4... trying... 0x000000-0x0fffff, Invalid OPCODE 0x06 spi_chip_erase_c7 failed during command execution FAILED! ERASE FAILED! FAILED! Your flash chip is in an unknown state. Get help on IRC at irc.freenode.net (channel #flashrom) or mail flashrom(a)flashrom.org! ------------------------------------------------------------------------------- DO NOT REBOOT OR POWEROFF! This patch should work for exactly one write of the old backup image. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-recover_apricot053/ichspi.c =================================================================== --- flashrom-recover_apricot053/ichspi.c (Revision 1072) +++ flashrom-recover_apricot053/ichspi.c (Arbeitskopie) @@ -686,7 +686,7 @@ int ich_spi_write_256(struct flashchip *flash, uint8_t * buf) { int i, ret = 0; - int total_size = flash->total_size * 1024; + int total_size = 0xf0000; int erase_size = 64 * 1024; int maxdata = 64; @@ -695,9 +695,9 @@ spi_disable_blockprotect(); /* Erase first */ - msg_pinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_perr("ERASE FAILED!\n"); + msg_pinfo("NOT erasing flash before programming... "); + if (check_erased_range(flash, 0, total_size)) { + msg_perr("To-be-written region is NOT ERASED! Aborting.\n"); return -1; } msg_pinfo("done.\n"); -- http://www.hailfinger.org/

1 0

HP Compaq dc7100 SFF
by Mattias Mattsson 09 Jul '10

09 Jul '10

Hi, I'm using flashrom r1070 on a HP Compaq dc7100 (HP branded m/b) and the flash chip is not detected. It's a Winbond W39V040FAP. Latest BIOS is available here: ftp://ftp.hp.com/pub/softpaq/sp40001-40500/sp40405.exe Output from flashrom, superiotool and lspci attached. Please let me know if I can do anything else to help. Thanks, -mattias

3 4

Mosel Vitelic flash rom datasheets needed
by Carl-Daniel Hailfinger 08 Jul '10

08 Jul '10

Hi, Mosel Vitelic seems to have closed down in 2009, and I only have one datasheet from them. It would be awesome if anyone could dig up a list of their flash chips and/or related datasheets. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 2

Asus P2B-N
by Mattias Mattsson 08 Jul '10

08 Jul '10

Hi, I'm using latest flashrom (r1070) on an Asus P2B-N h/w rev. 1.04. Unfortunately it can't find the flash chip. (It's a MVC V29C51002T-90P). Output from flashrom, superiotool and lspci attached. -mattias

2 2

[PATCH] Make programmer_param static
by Carl-Daniel Hailfinger 08 Jul '10

08 Jul '10

Make programmer_param static by converting all users to extract_programmer_param. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-programmer_param_static/flash.h =================================================================== --- flashrom-programmer_param_static/flash.h (Revision 1070) +++ flashrom-programmer_param_static/flash.h (Arbeitskopie) @@ -570,7 +570,6 @@ }; extern struct decode_sizes max_rom_decode; extern int programmer_may_write; -extern char *programmer_param; extern unsigned long flashbase; extern int verbose; extern const char * const flashrom_version; @@ -585,6 +584,7 @@ int min(int a, int b); int max(int a, int b); char *extract_param(char **haystack, char *needle, char *delim); +char *extract_programmer_param(char *needle, char *delim); int check_erased_range(struct flashchip *flash, int start, int len); int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message); int need_erase(uint8_t *have, uint8_t *want, int len, enum write_granularity gran); Index: flashrom-programmer_param_static/it87spi.c =================================================================== --- flashrom-programmer_param_static/it87spi.c (Revision 1070) +++ flashrom-programmer_param_static/it87spi.c (Arbeitskopie) @@ -143,7 +143,7 @@ flashport |= sio_read(port, 0x65); msg_pdbg("Serial flash port 0x%04x\n", flashport); /* Non-default port requested? */ - portpos = extract_param(&programmer_param, "it87spiport", ",:"); + portpos = extract_programmer_param("it87spiport", ",:"); if (portpos && strlen(portpos)) { flashport = strtol(portpos, (char **)NULL, 0); msg_pinfo("Forcing serial flash port 0x%04x\n", Index: flashrom-programmer_param_static/buspirate_spi.c =================================================================== --- flashrom-programmer_param_static/buspirate_spi.c (Revision 1070) +++ flashrom-programmer_param_static/buspirate_spi.c (Arbeitskopie) @@ -101,14 +101,14 @@ char *speed = NULL; int spispeed = 0x7; - dev = extract_param(&programmer_param, "dev", ",:"); + dev = extract_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", ",:"); + speed = extract_programmer_param("spispeed", ",:"); if (speed) { for (i = 0; spispeeds[i].name; i++) if (!strncasecmp(spispeeds[i].name, speed, Index: flashrom-programmer_param_static/pcidev.c =================================================================== --- flashrom-programmer_param_static/pcidev.c (Revision 1070) +++ flashrom-programmer_param_static/pcidev.c (Arbeitskopie) @@ -94,7 +94,7 @@ /* Filter by vendor and also bb:dd.f (if supplied by the user). */ filter.vendor = vendor_id; - pcidev_bdf = extract_param(&programmer_param, "pci", ","); + pcidev_bdf = extract_programmer_param("pci", ","); if (pcidev_bdf != NULL) { if ((msg = pci_filter_parse_slot(&filter, pcidev_bdf))) { msg_perr("Error: %s\n", msg); Index: flashrom-programmer_param_static/serprog.c =================================================================== --- flashrom-programmer_param_static/serprog.c (Revision 1070) +++ flashrom-programmer_param_static/serprog.c (Arbeitskopie) @@ -306,7 +306,7 @@ int have_device = 0; /* the parameter is either of format "dev=/dev/device:baud" or "ip=ip:port" */ - device = extract_param(&programmer_param, "dev", ","); + device = extract_programmer_param("dev", ","); if (device && strlen(device)) { baudport = strstr(device, ":"); if (baudport) { @@ -333,7 +333,7 @@ } free(device); - device = extract_param(&programmer_param, "ip", ","); + device = extract_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"); Index: flashrom-programmer_param_static/ft2232_spi.c =================================================================== --- flashrom-programmer_param_static/ft2232_spi.c (Revision 1070) +++ flashrom-programmer_param_static/ft2232_spi.c (Arbeitskopie) @@ -80,7 +80,7 @@ enum ftdi_interface ft2232_interface = INTERFACE_B; char *arg; - arg = extract_param(&programmer_param, "type", ",:"); + arg = extract_programmer_param("type", ",:"); if (arg) { if (!strcasecmp(arg, "2232H")) ft2232_type = FTDI_FT2232H; @@ -93,7 +93,7 @@ } } free(arg); - arg = extract_param(&programmer_param, "port", ",:"); + arg = extract_programmer_param("port", ",:"); if (arg) { switch (toupper(*arg)) { case 'A': Index: flashrom-programmer_param_static/dummyflasher.c =================================================================== --- flashrom-programmer_param_static/dummyflasher.c (Revision 1070) +++ flashrom-programmer_param_static/dummyflasher.c (Arbeitskopie) @@ -37,7 +37,7 @@ msg_pspew("%s\n", __func__); - bustext = extract_param(&programmer_param, "bus", ",:"); + bustext = extract_programmer_param("bus", ",:"); msg_pdbg("Requested buses are: %s\n", bustext ? bustext : "default"); if (!bustext) bustext = strdup("parallel+lpc+fwh+spi"); Index: flashrom-programmer_param_static/chipset_enable.c =================================================================== --- flashrom-programmer_param_static/chipset_enable.c (Revision 1070) +++ flashrom-programmer_param_static/chipset_enable.c (Arbeitskopie) @@ -300,7 +300,7 @@ int max_decode_fwh_decode = 0; int contiguous = 1; - idsel = extract_param(&programmer_param, "fwh_idsel", ",:"); + idsel = extract_programmer_param("fwh_idsel", ",:"); if (idsel && strlen(idsel)) { fwh_conf = (uint32_t)strtoul(idsel, NULL, 0); Index: flashrom-programmer_param_static/flashrom.c =================================================================== --- flashrom-programmer_param_static/flashrom.c (Revision 1070) +++ flashrom-programmer_param_static/flashrom.c (Arbeitskopie) @@ -89,7 +89,7 @@ ; #endif -char *programmer_param = NULL; +static char *programmer_param = NULL; /* Supported buses for the current programmer. */ enum chipbustype buses_supported; @@ -641,6 +641,11 @@ return opt; } +char *extract_programmer_param(char *needle, char *delim) +{ + return extract_param(&programmer_param, needle, delim); +} + /* start is an offset to the base address of the flash chip */ int check_erased_range(struct flashchip *flash, int start, int len) { Index: flashrom-programmer_param_static/internal.c =================================================================== --- flashrom-programmer_param_static/internal.c (Revision 1070) +++ flashrom-programmer_param_static/internal.c (Arbeitskopie) @@ -121,7 +121,7 @@ int force_laptop = 0; char *arg; - arg = extract_param(&programmer_param, "boardenable", ",:"); + arg = extract_programmer_param("boardenable", ",:"); if (arg && !strcmp(arg,"force")) { force_boardenable = 1; } else if (arg && !strlen(arg)) { @@ -135,7 +135,7 @@ } free(arg); - arg = extract_param(&programmer_param, "boardmismatch", ",:"); + arg = extract_programmer_param("boardmismatch", ",:"); if (arg && !strcmp(arg,"force")) { force_boardmismatch = 1; } else if (arg && !strlen(arg)) { @@ -149,7 +149,7 @@ } free(arg); - arg = extract_param(&programmer_param, "laptop", ",:"); + arg = extract_programmer_param("laptop", ",:"); if (arg && !strcmp(arg,"force_I_want_a_brick")) { force_laptop = 1; } else if (arg && !strlen(arg)) { -- http://www.hailfinger.org/

2 4

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

08 Jul '10

Author: hailfinger Date: Thu Jul 8 12:13:37 2010 New Revision: 1072 URL: http://flashrom.org/trac/coreboot/changeset/1072 Log: Make programmer_param static by converting all users to extract_programmer_param. Programmer parameters can no longer be separated with a colon, they have to be separated with a comma. 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/buspirate_spi.c trunk/chipset_enable.c trunk/dummyflasher.c trunk/flash.h trunk/flashrom.c trunk/ft2232_spi.c trunk/internal.c trunk/it87spi.c trunk/pcidev.c trunk/serprog.c Modified: trunk/buspirate_spi.c ============================================================================== --- trunk/buspirate_spi.c Thu Jul 8 11:32:18 2010 (r1071) +++ trunk/buspirate_spi.c Thu Jul 8 12:13:37 2010 (r1072) @@ -101,14 +101,14 @@ char *speed = NULL; int spispeed = 0x7; - dev = extract_param(&programmer_param, "dev", ",:"); + dev = extract_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", ",:"); + speed = extract_programmer_param("spispeed"); if (speed) { for (i = 0; spispeeds[i].name; i++) if (!strncasecmp(spispeeds[i].name, speed, Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Thu Jul 8 11:32:18 2010 (r1071) +++ trunk/chipset_enable.c Thu Jul 8 12:13:37 2010 (r1072) @@ -300,7 +300,7 @@ int max_decode_fwh_decode = 0; int contiguous = 1; - idsel = extract_param(&programmer_param, "fwh_idsel", ",:"); + idsel = extract_programmer_param("fwh_idsel"); if (idsel && strlen(idsel)) { fwh_conf = (uint32_t)strtoul(idsel, NULL, 0); Modified: trunk/dummyflasher.c ============================================================================== --- trunk/dummyflasher.c Thu Jul 8 11:32:18 2010 (r1071) +++ trunk/dummyflasher.c Thu Jul 8 12:13:37 2010 (r1072) @@ -37,7 +37,7 @@ msg_pspew("%s\n", __func__); - bustext = extract_param(&programmer_param, "bus", ",:"); + bustext = extract_programmer_param("bus"); msg_pdbg("Requested buses are: %s\n", bustext ? bustext : "default"); if (!bustext) bustext = strdup("parallel+lpc+fwh+spi"); Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Thu Jul 8 11:32:18 2010 (r1071) +++ trunk/flash.h Thu Jul 8 12:13:37 2010 (r1072) @@ -570,7 +570,6 @@ }; extern struct decode_sizes max_rom_decode; extern int programmer_may_write; -extern char *programmer_param; extern unsigned long flashbase; extern int verbose; extern const char * const flashrom_version; @@ -585,6 +584,7 @@ int min(int a, int b); int max(int a, int b); char *extract_param(char **haystack, char *needle, char *delim); +char *extract_programmer_param(char *param_name); int check_erased_range(struct flashchip *flash, int start, int len); int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message); int need_erase(uint8_t *have, uint8_t *want, int len, enum write_granularity gran); Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Thu Jul 8 11:32:18 2010 (r1071) +++ trunk/flashrom.c Thu Jul 8 12:13:37 2010 (r1072) @@ -89,7 +89,7 @@ ; #endif -char *programmer_param = NULL; +static char *programmer_param = NULL; /* Supported buses for the current programmer. */ enum chipbustype buses_supported; @@ -641,6 +641,11 @@ return opt; } +char *extract_programmer_param(char *param_name) +{ + return extract_param(&programmer_param, param_name, ","); +} + /* start is an offset to the base address of the flash chip */ int check_erased_range(struct flashchip *flash, int start, int len) { Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Thu Jul 8 11:32:18 2010 (r1071) +++ trunk/ft2232_spi.c Thu Jul 8 12:13:37 2010 (r1072) @@ -80,7 +80,7 @@ enum ftdi_interface ft2232_interface = INTERFACE_B; char *arg; - arg = extract_param(&programmer_param, "type", ",:"); + arg = extract_programmer_param("type"); if (arg) { if (!strcasecmp(arg, "2232H")) ft2232_type = FTDI_FT2232H; @@ -93,7 +93,7 @@ } } free(arg); - arg = extract_param(&programmer_param, "port", ",:"); + arg = extract_programmer_param("port"); if (arg) { switch (toupper(*arg)) { case 'A': Modified: trunk/internal.c ============================================================================== --- trunk/internal.c Thu Jul 8 11:32:18 2010 (r1071) +++ trunk/internal.c Thu Jul 8 12:13:37 2010 (r1072) @@ -121,7 +121,7 @@ int force_laptop = 0; char *arg; - arg = extract_param(&programmer_param, "boardenable", ",:"); + arg = extract_programmer_param("boardenable"); if (arg && !strcmp(arg,"force")) { force_boardenable = 1; } else if (arg && !strlen(arg)) { @@ -135,7 +135,7 @@ } free(arg); - arg = extract_param(&programmer_param, "boardmismatch", ",:"); + arg = extract_programmer_param("boardmismatch"); if (arg && !strcmp(arg,"force")) { force_boardmismatch = 1; } else if (arg && !strlen(arg)) { @@ -149,7 +149,7 @@ } free(arg); - arg = extract_param(&programmer_param, "laptop", ",:"); + arg = extract_programmer_param("laptop"); if (arg && !strcmp(arg,"force_I_want_a_brick")) { force_laptop = 1; } else if (arg && !strlen(arg)) { Modified: trunk/it87spi.c ============================================================================== --- trunk/it87spi.c Thu Jul 8 11:32:18 2010 (r1071) +++ trunk/it87spi.c Thu Jul 8 12:13:37 2010 (r1072) @@ -143,7 +143,7 @@ flashport |= sio_read(port, 0x65); msg_pdbg("Serial flash port 0x%04x\n", flashport); /* Non-default port requested? */ - portpos = extract_param(&programmer_param, "it87spiport", ",:"); + portpos = extract_programmer_param("it87spiport"); if (portpos && strlen(portpos)) { flashport = strtol(portpos, (char **)NULL, 0); msg_pinfo("Forcing serial flash port 0x%04x\n", Modified: trunk/pcidev.c ============================================================================== --- trunk/pcidev.c Thu Jul 8 11:32:18 2010 (r1071) +++ trunk/pcidev.c Thu Jul 8 12:13:37 2010 (r1072) @@ -94,7 +94,7 @@ /* Filter by vendor and also bb:dd.f (if supplied by the user). */ filter.vendor = vendor_id; - pcidev_bdf = extract_param(&programmer_param, "pci", ","); + pcidev_bdf = extract_programmer_param("pci"); if (pcidev_bdf != NULL) { if ((msg = pci_filter_parse_slot(&filter, pcidev_bdf))) { msg_perr("Error: %s\n", msg); Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Thu Jul 8 11:32:18 2010 (r1071) +++ trunk/serprog.c Thu Jul 8 12:13:37 2010 (r1072) @@ -306,7 +306,7 @@ int have_device = 0; /* the parameter is either of format "dev=/dev/device:baud" or "ip=ip:port" */ - device = extract_param(&programmer_param, "dev", ","); + device = extract_programmer_param("dev"); if (device && strlen(device)) { baudport = strstr(device, ":"); if (baudport) { @@ -333,7 +333,7 @@ } free(device); - device = extract_param(&programmer_param, "ip", ","); + device = extract_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");

1 0

Re: [flashrom] [PATCH] Fix ASUS A8N-VM CSM board enable entry
by Carl-Daniel Hailfinger 08 Jul '10

08 Jul '10

On 08.07.2010 00:43, Michael Karcher wrote: > 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> > Your explanation looks good, but I don't own the hardware. Still... Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[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 08 Jul '10

08 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 08 Jul '10

08 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 08 Jul '10

08 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

[PATCH] Allow programmers to disallow writes
by Carl-Daniel Hailfinger 03 Jul '10

03 Jul '10

If a programmer has untested or non-working write/erase code, but probing/reading works, it makes sense to protect the user against write/erase accidents. This feature will be used by the Nvidia MCP SPI code, and it also might make sense for the gfxnvidia driver which has non-working write/erase. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-programmer_may_write/flash.h =================================================================== --- flashrom-programmer_may_write/flash.h (Revision 1065) +++ flashrom-programmer_may_write/flash.h (Arbeitskopie) @@ -569,6 +569,7 @@ uint32_t spi; }; extern struct decode_sizes max_rom_decode; +extern int programmer_may_write; extern char *programmer_param; extern unsigned long flashbase; extern int verbose; Index: flashrom-programmer_may_write/flashrom.c =================================================================== --- flashrom-programmer_may_write/flashrom.c (Revision 1065) +++ flashrom-programmer_may_write/flashrom.c (Arbeitskopie) @@ -109,6 +109,9 @@ .spi = 0xffffffff }; +/* Is writing allowed with this programmer? */ +int programmer_may_write = 1; + const struct programmer_entry programmer_table[] = { #if CONFIG_INTERNAL == 1 { @@ -1360,6 +1363,21 @@ size = flash->total_size * 1024; buf = (uint8_t *) calloc(size, sizeof(char)); + if (!programmer_may_write && (write_it || erase_it)) { + msg_perr("Write/erase is not working yet on your programmer in " + "its current configuration.\n"); + /* --force is the wrong approach, but it's the best we can do + * until the generic programmer parameter parser is merged. + */ + if (!force) { + msg_perr("Aborting.\n"); + programmer_shutdown(); + return 1; + } else { + msg_cerr("Continuing anyway.\n"); + } + } + if (erase_it) { if (flash->tested & TEST_BAD_ERASE) { msg_cerr("Erase is not working on this chip. "); -- http://www.hailfinger.org/

2 4

[commit] r1069 - trunk
by repository service 03 Jul '10

03 Jul '10

Author: hailfinger Date: Sat Jul 3 14:14:25 2010 New Revision: 1069 URL: http://flashrom.org/trac/coreboot/changeset/1069 Log: If a programmer has untested or non-working write/erase code, but probing/reading works, it makes sense to protect the user against write/erase accidents. This feature will be used by the Nvidia MCP SPI code, and it also might make sense for the gfxnvidia driver which has non-working write/erase. 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/flash.h trunk/flashrom.c Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Sat Jul 3 13:02:10 2010 (r1068) +++ trunk/flash.h Sat Jul 3 14:14:25 2010 (r1069) @@ -569,6 +569,7 @@ uint32_t spi; }; extern struct decode_sizes max_rom_decode; +extern int programmer_may_write; extern char *programmer_param; extern unsigned long flashbase; extern int verbose; Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sat Jul 3 13:02:10 2010 (r1068) +++ trunk/flashrom.c Sat Jul 3 14:14:25 2010 (r1069) @@ -103,6 +103,9 @@ /* If nonzero, used as the start address of bottom-aligned flash. */ unsigned long flashbase; +/* Is writing allowed with this programmer? */ +int programmer_may_write; + const struct programmer_entry programmer_table[] = { #if CONFIG_INTERNAL == 1 { @@ -447,6 +450,8 @@ flashbase = 0; /* Registering shutdown functions is now allowed. */ may_register_shutdown = 1; + /* Default to allowing writes. Broken programmers set this to 0. */ + programmer_may_write = 1; programmer_param = param; msg_pdbg("Initializing %s programmer\n", @@ -1383,6 +1388,21 @@ size = flash->total_size * 1024; buf = (uint8_t *) calloc(size, sizeof(char)); + if (!programmer_may_write && (write_it || erase_it)) { + msg_perr("Write/erase is not working yet on your programmer in " + "its current configuration.\n"); + /* --force is the wrong approach, but it's the best we can do + * until the generic programmer parameter parser is merged. + */ + if (!force) { + msg_perr("Aborting.\n"); + programmer_shutdown(); + return 1; + } else { + msg_cerr("Continuing anyway.\n"); + } + } + if (erase_it) { if (flash->tested & TEST_BAD_ERASE) { msg_cerr("Erase is not working on this chip. ");

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom