flashrom November 2014

flashrom@flashrom.org

23 participants
50 discussions

Trying to program flash on Minnowboard
by Robert Johnston 05 Nov '14

05 Nov '14

Hi, I am trying to use flashrom and a TinCanTools flyswatter2 to program the Winbond W25Q32 flash via SPI. After researching how to use flashrom and the flyswatter, I tried the following: robert@STS-MAX:~/Downloads/MB_UEFI_Firmware_v1.00$ sudo flashrom --programmer internal --write MINNOW.fd [sudo] password for robert: flashrom v0.9.6.1-r1563 on Linux 3.13.0-39-generic (x86_64) flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Found chipset "Intel H67". Enabling flash write... FREG0: WARNING: Flash Descriptor region (0x00000000-0x00000fff) is read-only. FREG2: WARNING: Management Engine region (0x00003000-0x001fffff) is locked. Please send a verbose log to flashrom(a)flashrom.org if this board is not listed on http://flashrom.org/Supported_hardware#Supported_mainboards yet. Writes have been disabled. You can enforce write support with the ich_spi_force programmer option, but it will most likely harm your hardware! If you force flashrom you will get no support if something breaks. OK. Found Winbond flash chip "W25Q32" (4096 kB, SPI) at physical address 0xffc00000. Write/erase is not working yet on your programmer in its current configuration. Aborting. So apparently it does find the W25Q32 chip, and I may be getting close. Before I proceed to possible destruction, does anyone have suggestions? Thanks Robert

1 0

W836xx: Lenvo ThinkPad X60s: flashrom -V
by Sevan / Venture37 03 Nov '14

03 Nov '14

flashrom v0.9.7-r1711 on NetBSD 6.1.5 (i386) flashrom is free software, get the source code at http://www.flashrom.org flashrom was built with libpci 3.2.1, GCC 4.5.3, little endian Command line (3 args): flashrom -V -p internal Calibrating delay loop... OS timer resolution is 1 usecs, 1021M loops per second, 10 myus = 10 us, 100 myus = 93 us, 1000 myus = 922 us, 10000 myus = 9213 us, 4 myus = 4 us, OK. Initializing internal programmer Found candidate at: 00000500-00000510 Found coreboot table at 0x00000500. Found candidate at: 00000000-000008b8 Found coreboot table at 0x00000000. coreboot table found at 0x7f6ac000. coreboot header(24) checksum: f2a9 table(2232) checksum: 72e2 entries: 14 Vendor ID: LENOVO, part ID: ThinkPad X60 DMI string system-manufacturer: "LENOVO" DMI string system-product-name: "17045LG" DMI string system-version: "ThinkPad X60s" DMI string baseboard-manufacturer: "LENOVO" DMI string baseboard-product-name: "17045LG" DMI string baseboard-version: "ThinkPad X60s" DMI string chassis-type: "Laptop" Laptop detected via DMI. W836xx enter config mode worked or we were already in config mode. W836xx leave config mode had no effect. Active config mode, unknown reg 0x20 ID: ea. Please send the output of "flashrom -V" to flashrom(a)flashrom.org with W836xx: your board name: flashrom -V as the subject to help us finish support for your Super I/O. Thanks. Whitelisted laptop detected. Found chipset "Intel ICH7M" with PCI ID 8086:27b9. 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 enabled 0xffe00000/0xffa00000 FWH decode enabled 0xffd80000/0xff980000 FWH decode enabled 0xffd00000/0xff900000 FWH decode enabled 0xffc80000/0xff880000 FWH decode enabled 0xffc00000/0xff800000 FWH decode enabled 0xff700000/0xff300000 FWH decode enabled 0xff600000/0xff200000 FWH decode enabled 0xff500000/0xff100000 FWH decode enabled 0xff400000/0xff000000 FWH decode enabled Maximum FWH chip size: 0x100000 bytes BIOS_CNTL = 0x09: BIOS Lock Enable: disabled, BIOS Write Enable: enabled Root Complex Register Block address = 0xfed1c000 GCS = 0x440: BIOS Interface Lock-Down: disabled, Boot BIOS Straps: 0x1 (SPI) Top Swap : not enabled SPIBAR = 0xfed1c000 + 0x3020 0x00: 0x0004 (SPIS) 0x02: 0x4140 (SPIC) 0x04: 0x00000000 (SPIA) 0x08: 0xbf4141bf (SPID0) 0x0c: 0x00000000 (SPID0+4) 0x10: 0x00000000 (SPID1) 0x14: 0x00000000 (SPID1+4) 0x18: 0x00000000 (SPID2) 0x1c: 0x00000000 (SPID2+4) 0x20: 0x00000000 (SPID3) 0x24: 0x00000000 (SPID3+4) 0x28: 0x00000000 (SPID4) 0x2c: 0x00000000 (SPID4+4) 0x30: 0x00000000 (SPID5) 0x34: 0x00000000 (SPID5+4) 0x38: 0xfffa7de9 (SPID6) 0x3c: 0x000000ff (SPID6+4) 0x40: 0xfffadfe9 (SPID7) 0x44: 0xfffffa50 (SPID7+4) 0x50: 0x00000000 (BBAR) 0x54: 0x0004 (PREOP) 0x56: 0x0000 (OPTYPE) 0x58: 0x00000005 (OPMENU) 0x5c: 0x00000000 (OPMENU+4) 0x60: 0x00000000 (PBR0) 0x64: 0x00000000 (PBR1) 0x68: 0x00000000 (PBR2) Programming OPCODES... done SPI Read Configuration: prefetching enabled, caching enabled, OK. The following protocols are supported: SPI. Probing for AMIC A25L05PT, 64 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L05PU, 64 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L10PT, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L10PU, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L20PT, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L20PU, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L40PT, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L40PU, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L80P, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L16PT, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L16PU, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L512, 64 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L010, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L020, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L040, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L080, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L016, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25L032, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25LQ16, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25LQ032/A25LQ32A, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for AMIC A25LQ64, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT25DF021, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT25DF041A, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT25DF081, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT25DF081A, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT25DF161, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT25DF321, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT25DF321A, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT25DF641(A), 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT25DQ161, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT25F512, 64 kB: probe_spi_at25f: id1 0xff, id2 0xff Probing for Atmel AT25F512A, 64 kB: probe_spi_at25f: id1 0xff, id2 0xff Probing for Atmel AT25F512B, 64 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT25F1024(A), 128 kB: probe_spi_at25f: id1 0xff, id2 0xff Probing for Atmel AT25F2048, 256 kB: probe_spi_at25f: id1 0xff, id2 0xff Probing for Atmel AT25F4096, 512 kB: probe_spi_at25f: id1 0xff, id2 0xff Probing for Atmel AT25FS010, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT25FS040, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT26DF041, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT26DF081A, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT26DF161, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT26DF161A, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT26F004, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT45CS1282, 16896 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT45DB011D, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT45DB021D, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT45DB041D, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT45DB081D, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT45DB161D, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT45DB321C, 4224 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT45DB321D, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel AT45DB642D, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for ESMT F25L008A, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B05, 64 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B05T, 64 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B10, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B10T, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B20, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B20T, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B40, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B40T, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B80, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B80T, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B16, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B16T, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B32, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B32T, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B64, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25B64T, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25F05, 64 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25F10, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25F20, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25F40, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25F80, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25F16, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25F32, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25F64, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25Q40, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25Q80(A), 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25Q16, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25Q32(A/B), 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25Q64, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25Q128, 16384 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25QH16, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25QH32, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25QH64, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25QH128, 16384 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25S10, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25S20, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25S40, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25S80, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25S16, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25S32, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon EN25S64, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for GigaDevice GD25LQ32, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for GigaDevice GD25Q512, 64 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for GigaDevice GD25Q10, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for GigaDevice GD25Q20(B), 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for GigaDevice GD25Q40(B), 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for GigaDevice GD25Q80(B), 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for GigaDevice GD25Q16(B), 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for GigaDevice GD25Q32(B), 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for GigaDevice GD25Q64(B), 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for GigaDevice GD25Q128B, 16384 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for GigaDevice GD25T80, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Intel 25F160S33B8, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Intel 25F160S33T8, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Intel 25F320S33B8, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Intel 25F320S33T8, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Intel 25F640S33B8, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Intel 25F640S33T8, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L512(E)/MX25V512(C), 64 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L1005(C)/MX25L1006E, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L2005(C), 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L4005(A/C), 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L8005/MX25V8005, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L1605, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L1605A/MX25L1606E, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L1605D/MX25L1608D, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L1635D, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L1635E, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L3205(A), 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L3205D/MX25L3208D, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L3206E, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L3235D, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L6405(D), 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L6406E/MX25L6436E, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L6445E, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25L12805(D), 16384 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25U1635E, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25U3235E/F, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix MX25U6435E/F, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25P05-A, 64 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25P05, 64 kB: Ignoring RES in favour of RDID. Probing for Micron/Numonyx/ST M25P10-A, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25P10, 128 kB: Ignoring RES in favour of RDID. Probing for Micron/Numonyx/ST M25P20, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25P20-old, 256 kB: Ignoring RES in favour of RDID. Probing for Micron/Numonyx/ST M25P40, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25P40-old, 512 kB: Ignoring RES in favour of RDID. Probing for Micron/Numonyx/ST M25P80, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25P16, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25P32, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25P64, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25P128, 16384 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25PE10, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25PE20, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25PE40, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25PE80, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25PE16, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25PX80, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25PX16, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25PX32, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M25PX64, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M45PE10, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M45PE20, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M45PE40, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M45PE80, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST M45PE16, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST N25Q016, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST N25Q032..1E, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST N25Q032..3E, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST N25Q064..1E, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST N25Q064..3E, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST N25Q128..1E, 16384 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Micron/Numonyx/ST N25Q128..3E, 16384 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Nantronics N25S10, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Nantronics N25S20, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Nantronics N25S40, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Nantronics N25S80, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Nantronics N25S16, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for PMC Pm25LD256C, 32 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for PMC Pm25LD512(C), 64 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for PMC Pm25LD010(C), 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for PMC Pm25LD020(C), 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for PMC Pm25LD040(C), 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for PMC Pm25LV512(A), 64 kB: probe_spi_res3: id1 0xbf41, id2 0xbf Probing for PMC Pm25LV010, 128 kB: probe_spi_res3: id1 0xbf41, id2 0xbf Probing for PMC Pm25LV010A, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for PMC Pm25LV020, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for PMC Pm25LV040, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for PMC Pm25LV080B, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for PMC Pm25LV016B, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Sanyo LE25FW203A, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Sanyo LE25FW403A, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Sanyo LE25FW418A, 512 kB: probe_spi_res2: id1 0xbf, id2 0x41 Probing for Sanyo LE25FW806, 1024 kB: probe_spi_res2: id1 0xbf, id2 0x41 Probing for Sanyo LE25FW808, 1024 kB: probe_spi_res2: id1 0xbf, id2 0x41 Probing for Spansion S25FL004A, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Spansion S25FL008A, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Spansion S25FL016A, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Spansion S25FL032A/P, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Spansion S25FL064A/P, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Spansion S25FL204K, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Spansion S25FL208K, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Spansion S25FL116K/S25FL216K, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Spansion S25FL128S......0, 16384 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for SST SST25LF040A, 512 kB: probe_spi_res2: id1 0xbf, id2 0x41 Probing for SST SST25LF080(A), 1024 kB: probe_spi_res2: id1 0xbf, id2 0x41 Probing for SST SST25VF010, 128 kB: probe_spi_rems: id1 0xbf, id2 0x41 Probing for SST SST25VF016B, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Found SST flash chip "SST25VF016B" (2048 kB, SPI) at physical address 0xffe00000. Chip status register is 0x00. Chip status register: Block Protect Write Disable (BPL) is not set Chip status register: Auto Address Increment Programming (AAI) is not set Chip status register: Block Protect 3 (BP3) is not set Chip status register: Block Protect 2 (BP2) is not set Chip status register: Block Protect 1 (BP1) is not set Chip status register: 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 Resulting block protection : none Probing for SST SST25VF032B, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for SST SST25VF064C, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for SST SST25VF040, 512 kB: probe_spi_rems: id1 0xbf, id2 0x41 Probing for SST SST25VF040B, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for SST SST25VF040B.REMS, 512 kB: probe_spi_rems: id1 0xbf, id2 0x41 Probing for SST SST25VF080B, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for SST SST25WF512, 64 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for SST SST25WF010, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for SST SST25WF020, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for SST SST25WF040, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25Q80.V, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25Q16.V, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25Q32.V, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25Q64.V, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25Q128.V, 16384 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25Q20.W, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25Q40.W, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25Q80.W, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25Q16.W, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25Q32.W, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25Q64.W, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25X10, 128 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25X20, 256 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25X40, 512 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25X80, 1024 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25X16, 2048 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25X32, 4096 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond W25X64, 8192 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Unknown SFDP-capable chip, 0 kB: No SFDP signature found. Probing for AMIC unknown AMIC SPI chip, 0 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Atmel unknown Atmel SPI chip, 0 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Eon unknown Eon SPI chip, 0 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Macronix unknown Macronix SPI chip, 0 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for PMC unknown PMC SPI chip, 0 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for SST unknown SST SPI chip, 0 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for ST unknown ST SPI chip, 0 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Sanyo unknown Sanyo SPI chip, 0 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Winbond unknown Winbond (ex Nexcom) SPI chip, 0 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Generic unknown SPI chip (RDID), 0 kB: probe_spi_rdid_generic: id1 0xbf, id2 0x2541 Probing for Generic unknown SPI chip (REMS), 0 kB: probe_spi_rems: id1 0xbf, id2 0x41 Found SST flash chip "SST25VF016B" (2048 kB, SPI). No operations were specified. Restoring MMIO space at 0xbba9e070 Restoring MMIO space at 0xbba9e07c Restoring MMIO space at 0xbba9e078 Restoring MMIO space at 0xbba9e076 Restoring MMIO space at 0xbba9e074 Restoring PCI config space for 00:1f:0 reg 0xdc

1 0

[PATCH][RFC] rewrite read/write/verify to support layout/region based operations
by Alexander Couzens 02 Nov '14

02 Nov '14

Signed-off-by: Alexander Couzens <lynxis(a)fe80.eu> --- Hi everyone, I've rewritten read/write/verify functions to get romregions/layouts working in all cases. A write to a specific region required before a complete read of the chip. Because of this it wasn't possible to write to a specific region, when another region is locked (ME lockdown). And flashrom is faster now when writing to a rom region. Best, lynxis I've melt all my commits into a single one. A small commit version can be found at https://github.com/lynxis/flashrom/tree/v1/ cli_classic.c | 5 - flash.h | 13 +++ flashrom.c | 336 +++++++++++++++++++++++++++++++++++----------------------- layout.c | 23 ++-- 4 files changed, 228 insertions(+), 149 deletions(-) diff --git a/cli_classic.c b/cli_classic.c index 8588881..613c7aa 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -368,11 +368,6 @@ int main(int argc, char *argv[]) ret = 1; goto out; } - if (layoutfile != NULL && !write_it) { - msg_gerr("Layout files are currently supported for write operations only.\n"); - ret = 1; - goto out; - } if (process_include_args()) { ret = 1; diff --git a/flash.h b/flash.h index 03b26e7..ec85398 100644 --- a/flash.h +++ b/flash.h @@ -337,6 +337,19 @@ __attribute__((format(printf, 2, 3))); #define msg_cspew(...) print(MSG_SPEW, __VA_ARGS__) /* chip debug spew */ /* layout.c */ + +#define MAX_ROMLAYOUT 32 + +typedef struct { + chipoff_t start; + chipoff_t end; + unsigned int included; + char name[256]; +} romentry_t; + +extern romentry_t rom_entries[]; +extern int num_rom_entries; + int register_include_arg(char *name); int process_include_args(void); int read_romlayout(const char *name); diff --git a/flashrom.c b/flashrom.c index 9b82d4c..b2c59c2 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1434,45 +1434,67 @@ static int erase_and_write_block_helper(struct flashctx *flash, return ret; } -static int walk_eraseregions(struct flashctx *flash, int erasefunction, - int (*do_something) (struct flashctx *flash, - unsigned int addr, - unsigned int len, - uint8_t *param1, - uint8_t *param2, - int (*erasefn) ( - struct flashctx *flash, - unsigned int addr, - unsigned int len)), - void *param1, void *param2) +static int walk_eraseregions_offset_len( + struct flashctx *flash, int erasefunction, + int (*do_something) (struct flashctx *flash, + unsigned int addr, + unsigned int len, + uint8_t *param1, + uint8_t *param2, + int (*erasefn) ( + struct flashctx *flash, + unsigned int addr, + unsigned int len) + ), + void *oldcontent, + void *newcontent, + unsigned offset, + unsigned len) { int i, j; unsigned int start = 0; - unsigned int len; + unsigned int eraselen; struct block_eraser eraser = flash->chip->block_erasers[erasefunction]; for (i = 0; i < NUM_ERASEREGIONS; i++) { /* count==0 for all automatically initialized array * members so the loop below won't be executed for them. */ - len = eraser.eraseblocks[i].size; - for (j = 0; j < eraser.eraseblocks[i].count; j++) { + eraselen = eraser.eraseblocks[i].size; + for (j = 0; j < eraser.eraseblocks[i].count; j++, start += eraselen) { + if (start < offset) + continue; + /* Print this for every block except the first one. */ if (i || j) msg_cdbg(", "); - msg_cdbg("0x%06x-0x%06x", start, - start + len - 1); - if (do_something(flash, start, len, param1, param2, - eraser.block_erase)) { + msg_cdbg("0x%06x-0x%06x", start, start + eraselen - 1); + if (do_something(flash, start, eraselen, oldcontent, newcontent, eraser.block_erase)) { return 1; } - start += len; } } msg_cdbg("\n"); return 0; } +static int walk_eraseregions(struct flashctx *flash, int erasefunction, + int (*do_something) (struct flashctx *flash, + unsigned int addr, + unsigned int len, + uint8_t *param1, + uint8_t *param2, + int (*erasefn) ( + struct flashctx *flash, + unsigned int addr, + unsigned int len) + ), + void *oldcontent, + void *newcontent) +{ + return walk_eraseregions_offset_len(flash, erasefunction, do_something, oldcontent, newcontent, 0, flash->chip->total_size); +} + static int check_block_eraser(const struct flashctx *flash, int k, int log) { struct block_eraser eraser = flash->chip->block_erasers[k]; @@ -1562,7 +1584,7 @@ int erase_and_write_flash(struct flashctx *flash, uint8_t *oldcontents, uint8_t } return ret; } - +/* FIXME: Unused! static void nonfatal_help_message(void) { msg_gerr("Good, writing to the flash chip apparently didn't do anything.\n"); @@ -1579,7 +1601,7 @@ static void nonfatal_help_message(void) "the programmer and the flash chip. If you think the error is caused by flashrom\n" "please report this on IRC at chat.freenode.net (channel #flashrom) or\n" "mail flashrom(a)flashrom.org, thanks!\n"); -} +} */ static void emergency_help_message(void) { @@ -1895,153 +1917,201 @@ int chip_safety_check(const struct flashctx *flash, int force, int read_it, int return 0; } -/* This function signature is horrible. We need to design a better interface, - * but right now it allows us to split off the CLI code. - * Besides that, the function itself is a textbook example of abysmal code flow. - */ -int doit(struct flashctx *flash, int force, const char *filename, int read_it, - int write_it, int erase_it, int verify_it) -{ - uint8_t *oldcontents; - uint8_t *newcontents; +int read_flash(struct flashctx *flash, const char *filename) { int ret = 0; - unsigned long size = flash->chip->total_size * 1024; + int err = 0; /* used as ret for read_flash if a single partition fails */ + size_t flashsize = flash->chip->total_size * 1024; + int i; - if (chip_safety_check(flash, force, read_it, write_it, erase_it, verify_it)) { - msg_cerr("Aborting.\n"); - return 1; - } + uint8_t *contents = calloc(1, flashsize); - if (normalize_romentries(flash)) { - msg_cerr("Requested regions can not be handled. Aborting.\n"); - return 1; - } + for (i=0; i < num_rom_entries; i++) { + chipoff_t start = rom_entries[i].start; + chipoff_t end = rom_entries[i].end; + chipsize_t length = end - start; - /* Given the existence of read locks, we want to unlock for read, - * erase and write. - */ - if (flash->chip->unlock) - flash->chip->unlock(flash); + /* ignore entries not included */ + if (!rom_entries[i].included) + continue; - if (read_it) { - return read_flash_to_file(flash, filename); + ret = flash->chip->read(flash, contents + start, start, length); + if (ret) { + msg_cerr("Read for part %s (0x%x - 0x%x) failed!", rom_entries[i].name, start, end); + err = -1; + continue; + } } - oldcontents = malloc(size); - if (!oldcontents) { - msg_gerr("Out of memory!\n"); - exit(1); + ret = write_buf_to_file(contents, flashsize, filename); + if (ret) { + msg_cerr("Writing to file %s failed!", filename); + err = -1; } + + free(contents); + return err; +} + +int write_flash(struct flashctx *flash, const char *filename) { + int ret = 0; + size_t flashsize = flash->chip->total_size * 1024; + int i; + + uint8_t *oldcontents = calloc(1, flashsize); + uint8_t *newcontents = calloc(1, flashsize); + /* Assume worst case: All bits are 0. */ - memset(oldcontents, 0x00, size); - newcontents = malloc(size); - if (!newcontents) { - msg_gerr("Out of memory!\n"); - exit(1); - } - /* Assume best case: All bits should be 1. */ - memset(newcontents, 0xff, size); + memset(oldcontents, 0x00, flashsize); + + /* Assume worst case: All bits are 0. */ + memset(newcontents, 0xff, flashsize); /* Side effect of the assumptions above: Default write action is erase * because newcontents looks like a completely erased chip, and * oldcontents being completely 0x00 means we have to erase everything * before we can write. */ - if (erase_it) { + if(read_buf_from_file(newcontents, flashsize, filename)) { + msg_cerr("Can not read file %s\n. Aborting.\n", filename); + return -1; + } + +#if CONFIG_INTERNAL == 1 + /* FIXME: move this code into a small function and move it out of write_flash */ + if (programmer == PROGRAMMER_INTERNAL && cb_check_image(newcontents, flashsize) < 0) { + if (force_boardmismatch) { + msg_pinfo("Proceeding anyway because user forced us to.\n"); + } else { + msg_perr("Aborting. You can override this with " + "-p internal:boardmismatch=force.\n"); + return 1; + } + } +#endif + + for (i=0; i < num_rom_entries; i++) { + chipoff_t start = rom_entries[i].start; + chipoff_t end = rom_entries[i].end; + chipsize_t length = end - start; + + /* ignore entries not included */ + if (!rom_entries[i].included) + continue; + + /* read specified flash region */ + ret = flash->chip->read(flash, oldcontents + start, start, length); + if(ret) { + msg_cerr("Can not read flash position 0x%x len: 0x%x\n. Ret: %d Ignoring.\n", start, length, ret); + return -1; + } + + int k; + for (k = 0; k < NUM_ERASEFUNCTIONS; k++) { + if (k != 0) + msg_cinfo("Looking for another erase function.\n"); + + msg_cdbg("Trying erase function %i... ", k); + if (check_block_eraser(flash, k, 1)) + continue; + + ret = walk_eraseregions_offset_len(flash, k, &erase_and_write_block_helper, oldcontents, newcontents, start, length); + + /* If everything is OK, don't try another erase function. */ + if (!ret) + break; + } + + if (!ret) { + msg_cinfo("Finished flashing %d - region %s", ret, rom_entries[i].name); + } else { + msg_cerr("Failed flashing!"); + emergency_help_message(); /* FIXME: Do we really want the scary warning if erase failed? * After all, after erase the chip is either blank or partially * blank or it has the old contents. A blank chip won't boot, * so if the user wanted erase and reboots afterwards, the user * knows very well that booting won't work. */ - if (erase_and_write_flash(flash, oldcontents, newcontents)) { - emergency_help_message(); - ret = 1; } - goto out; } - if (write_it || verify_it) { - if (read_buf_from_file(newcontents, size, filename)) { - ret = 1; - goto out; - } + return 0; +} -#if CONFIG_INTERNAL == 1 - if (programmer == PROGRAMMER_INTERNAL && cb_check_image(newcontents, size) < 0) { - if (force_boardmismatch) { - msg_pinfo("Proceeding anyway because user forced us to.\n"); - } else { - msg_perr("Aborting. You can override this with " - "-p internal:boardmismatch=force.\n"); - ret = 1; - goto out; - } - } -#endif +int verify_flash(struct flashctx *flash, const char *filename) { + int ret = 0; + int verified = 0; + size_t flashsize = flash->chip->total_size * 1024; + int i; + + /* we alloc here the whole flashsize to be sure we have enought space */ + uint8_t *filecontents = calloc(1, flashsize); + + if(read_buf_from_file(filecontents, flashsize, filename)) { + msg_cerr("Can not read file %s\n. Aborting.\n", filename); + return -1; } - /* Read the whole chip to be able to check whether regions need to be - * erased and to give better diagnostics in case write fails. - * The alternative would be to read only the regions which are to be - * preserved, but in that case we might perform unneeded erase which - * takes time as well. - */ - msg_cinfo("Reading old flash chip contents... "); - if (flash->chip->read(flash, oldcontents, 0, size)) { - ret = 1; - msg_cinfo("FAILED.\n"); - goto out; + for (i=0; i < num_rom_entries; i++) { + chipoff_t start = rom_entries[i].start; + chipoff_t end = rom_entries[i].end; + chipsize_t length = end - start; + + /* ignore entries not included */ + if (!rom_entries[i].included) + continue; + + ret = verify_range(flash, filecontents + start, start, length); + if (ret) + verified = -1; } - msg_cinfo("done.\n"); - /* Build a new image taking the given layout into account. */ - build_new_image(flash, oldcontents, newcontents); + return verified; +} + +/* This function signature is horrible. We need to design a better interface, + * but right now it allows us to split off the CLI code. + * Besides that, the function itself is a textbook example of abysmal code flow. + */ +int doit(struct flashctx *flash, int force, const char *filename, int read_it, + int write_it, int erase_it, int verify_it) +{ + + int ret = 0; - // //////////////////////////////////////////////////////////// + if (chip_safety_check(flash, force, read_it, write_it, erase_it, verify_it)) { + msg_cerr("Aborting.\n"); + return 1; + } - if (write_it) { - if (erase_and_write_flash(flash, oldcontents, newcontents)) { - msg_cerr("Uh oh. Erase/write failed. Checking if anything has changed.\n"); - msg_cinfo("Reading current flash chip contents... "); - if (!flash->chip->read(flash, newcontents, 0, size)) { - msg_cinfo("done.\n"); - if (!memcmp(oldcontents, newcontents, size)) { - nonfatal_help_message(); - ret = 1; - goto out; - } - msg_cerr("Apparently at least some data has changed.\n"); - } else - msg_cerr("Can't even read anymore!\n"); - emergency_help_message(); - ret = 1; - goto out; - } + if (normalize_romentries(flash)) { + msg_cerr("Requested regions can not be handled. Aborting.\n"); + return 1; } - /* Verify only if we either did not try to write (verify operation) or actually changed something. */ - if (verify_it && (!write_it || !all_skipped)) { - msg_cinfo("Verifying flash... "); + /* Given the existence of read locks, we want to unlock for read, + * erase and write. + */ + if (flash->chip->unlock) + flash->chip->unlock(flash); - if (write_it) { - /* Work around chips which need some time to calm down. */ - programmer_delay(1000*1000); - ret = verify_range(flash, newcontents, 0, size); - /* If we tried to write, and verification now fails, we - * might have an emergency situation. - */ - if (ret) - emergency_help_message(); - } else { - ret = compare_range(newcontents, oldcontents, 0, size); - } - if (!ret) - msg_cinfo("VERIFIED.\n"); + if (read_it) { + return read_flash(flash, filename); } -out: - free(oldcontents); - free(newcontents); + if (write_it) { + ret = write_flash(flash, filename); + if (ret) + return ret; + } + + if (verify_it) { + ret = verify_flash(flash, filename); + if (ret) + return ret; + } + + msg_cinfo("done.\n"); + return ret; } diff --git a/layout.c b/layout.c index a12eb28..9bdf9b6 100644 --- a/layout.c +++ b/layout.c @@ -26,18 +26,9 @@ #include "flash.h" #include "programmer.h" -#define MAX_ROMLAYOUT 32 - -typedef struct { - chipoff_t start; - chipoff_t end; - unsigned int included; - char name[256]; -} romentry_t; - /* rom_entries store the entries specified in a layout file and associated run-time data */ -static romentry_t rom_entries[MAX_ROMLAYOUT]; -static int num_rom_entries = 0; /* the number of successfully parsed rom_entries */ +romentry_t rom_entries[MAX_ROMLAYOUT]; +int num_rom_entries = 0; /* the number of successfully parsed rom_entries */ /* include_args holds the arguments specified at the command line with -i. They must be processed at some point * so that desired regions are marked as "included" in the rom_entries list. */ @@ -254,6 +245,16 @@ int normalize_romentries(const struct flashctx *flash) } } + /* create a partition over the complete flash when no layout given */ + if (num_rom_entries == 0) { + rom_entries[0].start = 0x0; + rom_entries[0].end = flash->chip->total_size * 1024 - 1; + rom_entries[0].included = 1; + strncpy(rom_entries[0].name, "complete flash", 15); + + num_rom_entries = 1; + } + return ret; } -- 2.1.2

2 1

flashrom success report MS-7817
by Igor Kolker 02 Nov '14

02 Nov '14

I was able to flash the MSI H81M-U33 with flashrom. The built-in M-Flash wasnt working. Flashed from 6.0 to 6.6. BIOS Information Vendor: American Megatrends Inc. Version: V6.6 Release Date: 07/22/2014 Address: 0xF0000 Runtime Size: 64 kB ROM Size: 8192 kB Base Board Information Manufacturer: MSI Product Name: H81M-E33 (MS-7817) Linux Zaphod 3.13.0-38-generic #65-Ubuntu SMP Thu Oct 9 11:36:50 UTC 2014 x86_64 x86_64 x86_64 GNU/Linux processor : 0 vendor_id : GenuineIntel cpu family : 6 model : 60 model name : Intel(R) Pentium(R) CPU G3220 @ 3.00GHz stepping : 3 microcode : 0x1a root@Zaphod:~# flashrom -V -p internal -r BIOS.good flashrom v0.9.6.1-r1563 on Linux 3.13.0-38-generic (x86_64) flashrom is free software, get the source code at http://www.flashrom.org flashrom was built with libpci 3.1.9, GCC 4.7.1, little endian Command line (5 args): flashrom -V -p internal -r BIOS.good Calibrating delay loop... OS timer resolution is 1 usecs, 2998M loops per second, 10 myus = 10 us, 100 myus = 107 us, 1000 myus = 999 us, 10000 myus = 9997 us, 4 myus = 4 us, OK. Initializing internal programmer No coreboot table found. DMI string system-manufacturer: "MSI" DMI string system-product-name: "MS-7817" DMI string system-version: "1.0" DMI string baseboard-manufacturer: "MSI" DMI string baseboard-product-name: "H81M-E33 (MS-7817)" DMI string baseboard-version: "1.0" DMI string chassis-type: "Desktop" Found chipset "Intel Lynx Point" with PCI ID 8086:8c5c. This chipset is marked as untested. If you are using an up-to-date version of flashrom *and* were (not) able to successfully update your firmware with it, then please email a report to flashrom(a)flashrom.org including a verbose (-V) log. Thank you! Enabling flash write... enable_flash_ich_dc_spi: unknown ICH generation. Please report! 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 enabled 0xffe00000/0xffa00000 FWH decode enabled 0xffd80000/0xff980000 FWH decode enabled 0xffd00000/0xff900000 FWH decode enabled 0xffc80000/0xff880000 FWH decode enabled 0xffc00000/0xff800000 FWH decode enabled 0xff700000/0xff300000 FWH decode enabled 0xff600000/0xff200000 FWH decode enabled 0xff500000/0xff100000 FWH decode enabled 0xff400000/0xff000000 FWH decode enabled Maximum FWH chip size: 0x100000 bytes BIOS Lock Enable: disabled, BIOS Write Enable: disabled, BIOS_CNTL is 0x8 Root Complex Register Block address = 0xfed1c000 GCS = 0xc61: BIOS Interface Lock-Down: enabled, Boot BIOS Straps: 0x3 (unknown) Top Swap : not enabled SPIBAR = 0xfed1c000 + 0x3800 0x04: 0xf008 (HSFS) HSFS: FDONE=0, FCERR=0, AEL=0, BERASE=1, SCIP=0, FDOPSS=1, FDV=1, FLOCKDN=1 WARNING: SPI Configuration Lockdown activated. Reading OPCODES... done 0x06: 0x3f00 (HSFC) HSFC: FGO=0, FCYCLE=0, FDBC=63, SME=0 0x08: 0x007fffc0 (FADDR) 0x50: 0x0000ffff (FRAP) BMWAG 0x00, BMRAG 0x00, BRWA 0xff, BRRA 0xff 0x54: 0x00000000 FREG0: Flash Descriptor region (0x00000000-0x00000fff) is read-write. 0x58: 0x07ff0200 FREG1: BIOS region (0x00200000-0x007fffff) is read-write. 0x5C: 0x01ff0001 FREG2: Management Engine region (0x00001000-0x001fffff) is read-write. 0x90: 0xc0 (SSFS) SSFS: SCIP=0, FDONE=0, FCERR=0, AEL=0 0x91: 0xfc4010 (SSFC) SSFC: SCGO=0, ACS=0, SPOP=0, COP=1, DBC=0, SME=0, SCF=4 0x94: 0x0006 (PREOP) 0x96: 0x043b (OPTYPE) 0x98: 0x05203b02 (OPMENU) 0x9C: 0x0000019f (OPMENU+4) 0xA0: 0x00000000 (BBAR) 0xC4: 0x80802045 (LVSCC) LVSCC: BES=0x1, WG=1, WSR=0, WEWS=0, EO=0x20, VCL=1 0xC8: 0x00002045 (UVSCC) UVSCC: BES=0x1, WG=1, WSR=0, WEWS=0, EO=0x20, VCL=0 0xD0: 0x50444653 (FPB) Enabling hardware sequencing because some important opcode is locked. SPI Read Configuration: prefetching enabled, caching enabled, OK. The following protocols are supported: FWH, Programmer-specific. Probing for Programmer Opaque flash chip, 0 kB: Found 1 attached SPI flash chip with a density of 8192 kB. The flash address space (0x000000 - 0x1acfff) is divided at address 0x653000 in two partitions. The first partition ranges from 0x000000 to 0x652fff. In that range are 1619 erase blocks with 4096 B each. The second partition ranges from 0x653000 to 0x1acfff. In that range are 429 erase blocks with 4096 B each. Found Programmer flash chip "Opaque flash chip" (8192 kB, Programmer-specific) at physical address 0x0. Probing for Atmel AT49LH002, 256 kB: probe_82802ab: id1 0xff, id2 0xfc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 82802AB, 512 kB: probe_82802ab: id1 0x88, id2 0x6f, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 82802AC, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm49FL002, 256 kB: probe_jedec_common: id1 0xff, id2 0xfc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm49FL004, 512 kB: probe_jedec_common: id1 0x88, id2 0x6f, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Sharp LHF00L04, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF002A/B, 256 kB: probe_jedec_common: id1 0xff, id2 0xfc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF003A/B, 384 kB: probe_jedec_common: id1 0x02, id2 0x00, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF004A/B, 512 kB: probe_jedec_common: id1 0x88, id2 0x6f, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF004C, 512 kB: probe_82802ab: id1 0x88, id2 0x6f, id1 parity violation, id1 is normal flash content, id2 is normal flash content 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, id1 parity violation, id1 is normal flash content, id2 is normal flash content 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 0xb4, id2 0x73, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040A, 512 kB: probe_82802ab: id1 0x88, id2 0x6f, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040B, 512 kB: probe_82802ab: id1 0x88, id2 0x6f, id1 parity violation, 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: probe_82802ab: id1 0xff, id2 0xfc, id1 parity violation, id1 is normal flash content, id2 is normal flash content 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 0xb4, id2 0x73, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW040, 512 kB: probe_82802ab: id1 0x88, id2 0x6f, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW080, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040FA, 512 kB: probe_jedec_common: id1 0x88, id2 0x6f, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040FB, 512 kB: probe_jedec_common: id1 0x88, id2 0x6f, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040FC, 512 kB: probe_jedec_common: id1 0x88, id2 0x6f, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W49V002FA, 256 kB: probe_jedec_common: id1 0xff, id2 0xfc, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V080FA, 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 W39V080FA (dual mode), 512 kB: probe_jedec_common: id1 0x88, id2 0x6f, id1 parity violation, id1 is normal flash content, id2 is normal flash content Found Programmer flash chip "Opaque flash chip" (8192 kB, Programmer-specific). Reading flash... Reading 8388608 bytes starting at 0x000000. done. Restoring MMIO space at 0x7f74dc5858a0 Restoring PCI config space for 00:1f:0 reg 0xdc

2 1

Olimex ARM-USB-OCD-H output shifted by one
by Sanne Ausma 02 Nov '14

02 Nov '14

Hi, Using flashrom to probe for an EON 25Q32 using the ARM-USB-OCD-H I get the following: $./flashrom -p ft2232_spi:type=arm-usb-ocd-h -VVV flashrom v0.9.7-r1711 on Linux 3.11.0-12-generic (x86_64) flashrom is free software, get the source code at http://www.flashrom.org flashrom was built with libpci 3.1.9, GCC 4.8.1, little endian Command line (3 args): ./flashrom -p ft2232_spi:type=arm-usb-ocd-h -VVV Calibrating delay loop... OS timer resolution is 1 usecs, 1927M loops per second, 10 myus = 10 us, 100 myus = 101 us, 1000 myus = 988 us, 10000 myus = 9977 us, 4 myus = 4 us, OK. Initializing ft2232_spi programmer Using device type Olimex ARM-USB-OCD-H channel A. Disable divide-by-5 front stage Set clock divisor MPSSE clock: 60.000000 MHz, divisor: 2, SPI clock: 30.000000 MHz No loopback of TDI/DO TDO/DI Set data bits The following protocols are supported: SPI. Probing for AMIC A25L05PT, 64 kB: Assert CS# De-assert CS# RDID returned 0x0e 0x18 0x0b 0x0e. probe_spi_rdid_generic: id1 0x0e, id2 0x180b Probing for AMIC A25L05PU, 64 kB: Assert CS# De-assert CS# RDID returned 0x0e 0x18 0x0b 0x0e. probe_spi_rdid_generic: id1 0x0e, id2 0x180b Probing for AMIC A25L10PT, 128 kB: Assert CS# De-assert CS# RDID returned 0x0e 0x18 0x0b 0x0e. probe_spi_rdid_generic: id1 0x0e, id2 0x180b ... Whereas it should have read id1: 0x1c, id2: 0x3016 (0x1c = 0x0e<<1 and 0x3016 = 0x180b<<1) Is this a known issue with the Olimex ARM-USB-OCD-H? The wiki said it was currently untested... Thnx

2 2

Re: [flashrom] ASUSTeK M4N78 PRO: flashrom -V
by Stefan Tauner 02 Nov '14

02 Nov '14

On Mon, 27 Oct 2014 23:07:58 +0100 Red99 <red99(a)gmx.de> wrote: > Hi guys, > > some flashrom -V dump from my main board. Hope this helps. > Keep up the good work. I would love to hear about future support of this > board. Hello, the board should just work fine: http://www.flashrom.org/pipermail/flashrom/2012-January/008600.html -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

W25Q40BV succesfully erased and written using buspirate_spi
by Torben Nielsen 02 Nov '14

02 Nov '14

2 1

cbtable.c: Do not unnecessarily duplicate strings
by Paul Menzel 02 Nov '14

02 Nov '14

From: Paul Menzel <paulepanter(a)users.sourceforge.net> Date: Tue, 21 Oct 2014 23:46:18 +0200 Commit 1577 (Refactor the -p internal:mainboard handling.) got rid of the global variables `image_vendor` and `image_model`. Therefore duplicating strings to store it is not needed anymore. Found-by: Valgrind 3.10.0 ==25829== Command: /src/flashrom/flashrom -p internal -c W25Q32.V -w build/coreboot.rom […] ==25829== 7 bytes in 1 blocks are definitely lost in loss record 3 of 4 ==25829== at 0x40291CC: malloc (vg_replace_malloc.c:296) ==25829== by 0x40FD517: strdup (strdup.c:42) ==25829== by 0x8055869: cb_check_image (cbtable.c:86) ==25829== by 0x806466B: doit (flashrom.c:1972) ==25829== by 0x804A111: main (cli_classic.c:545) ==25829== ==25829== 7 bytes in 1 blocks are definitely lost in loss record 4 of 4 ==25829== at 0x40291CC: malloc (vg_replace_malloc.c:296) ==25829== by 0x40FD517: strdup (strdup.c:42) ==25829== by 0x8055873: cb_check_image (cbtable.c:87) ==25829== by 0x806466B: doit (flashrom.c:1972) ==25829== by 0x804A111: main (cli_classic.c:545) Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- cbtable.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/cbtable.c b/cbtable.c index c100bbb..1a74e46 100644 --- a/cbtable.c +++ b/cbtable.c @@ -40,8 +40,6 @@ static char *cb_vendor = NULL, *cb_model = NULL; */ int cb_check_image(uint8_t *image, int size) { - const char *image_vendor = NULL; - const char *image_model = NULL; unsigned int *walk; unsigned int mb_part_offset, mb_vendor_offset; char *mb_part, *mb_vendor; @@ -83,22 +81,20 @@ int cb_check_image(uint8_t *image, int size) msg_pdbg("coreboot last image size (not ROM size) is %d bytes.\n", *walk); - image_vendor = strdup(mb_vendor); - image_model = strdup(mb_part); - msg_pdbg("Manufacturer: %s\n", image_vendor); - msg_pdbg("Mainboard ID: %s\n", image_model); + msg_pdbg("Manufacturer: %s\n", mb_vendor); + msg_pdbg("Mainboard ID: %s\n", mb_part); /* If these are not set, the coreboot table was not found. */ if (!cb_vendor || !cb_model) return 0; /* These comparisons are case insensitive to make things a little less user^Werror prone. */ - if (!strcasecmp(image_vendor, cb_vendor) && !strcasecmp(image_model, cb_model)) { + if (!strcasecmp(mb_vendor, cb_vendor) && !strcasecmp(mb_part, cb_model)) { msg_pdbg2("This coreboot image matches this mainboard.\n"); } else { msg_perr("This coreboot image (%s:%s) does not appear to\n" "be correct for the detected mainboard (%s:%s).\n", - image_vendor, image_model, cb_vendor, cb_model); + mb_vendor, mb_part, cb_vendor, cb_model); return -1; } -- 2.1.1

2 1

[commit] r1854 - trunk
by repository service 02 Nov '14

02 Nov '14

Author: stefanct Date: Sun Nov 2 00:12:33 2014 New Revision: 1854 URL: http://flashrom.org/trac/flashrom/changeset/1854 Log: cbtable.c: Do not unnecessarily duplicate strings. The strdup calls were a leftover that slipped through the cleanup in r1577. Found-by: Valgrind 3.10.0 Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/cbtable.c Modified: trunk/cbtable.c ============================================================================== --- trunk/cbtable.c Sat Nov 1 23:56:06 2014 (r1853) +++ trunk/cbtable.c Sun Nov 2 00:12:33 2014 (r1854) @@ -40,8 +40,6 @@ */ int cb_check_image(uint8_t *image, int size) { - const char *image_vendor = NULL; - const char *image_model = NULL; unsigned int *walk; unsigned int mb_part_offset, mb_vendor_offset; char *mb_part, *mb_vendor; @@ -83,22 +81,20 @@ msg_pdbg("coreboot last image size (not ROM size) is %d bytes.\n", *walk); - image_vendor = strdup(mb_vendor); - image_model = strdup(mb_part); - msg_pdbg("Manufacturer: %s\n", image_vendor); - msg_pdbg("Mainboard ID: %s\n", image_model); + msg_pdbg("Manufacturer: %s\n", mb_vendor); + msg_pdbg("Mainboard ID: %s\n", mb_part); /* If these are not set, the coreboot table was not found. */ if (!cb_vendor || !cb_model) return 0; /* These comparisons are case insensitive to make things a little less user^Werror prone. */ - if (!strcasecmp(image_vendor, cb_vendor) && !strcasecmp(image_model, cb_model)) { + if (!strcasecmp(mb_vendor, cb_vendor) && !strcasecmp(mb_part, cb_model)) { msg_pdbg2("This coreboot image matches this mainboard.\n"); } else { msg_perr("This coreboot image (%s:%s) does not appear to\n" "be correct for the detected mainboard (%s:%s).\n", - image_vendor, image_model, cb_vendor, cb_model); + mb_vendor, mb_part, cb_vendor, cb_model); return -1; }

1 0

[commit] r1853 - trunk
by repository service 01 Nov '14

01 Nov '14

Author: stefanct Date: Sat Nov 1 23:56:06 2014 New Revision: 1853 URL: http://flashrom.org/trac/flashrom/changeset/1853 Log: Move strtok_r implementation verbatim to helpers.c. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Modified: trunk/flash.h trunk/helpers.c trunk/print.c Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Sun Oct 19 09:54:27 2014 (r1852) +++ trunk/flash.h Sat Nov 1 23:56:06 2014 (r1853) @@ -255,6 +255,9 @@ int min(int a, int b); char *strcat_realloc(char *dest, const char *src); void tolower_string(char *str); +#ifdef __MINGW32__ +char* strtok_r(char *str, const char *delim, char **nextp); +#endif /* flashrom.c */ extern const char flashrom_version[]; Modified: trunk/helpers.c ============================================================================== --- trunk/helpers.c Sun Oct 19 09:54:27 2014 (r1852) +++ trunk/helpers.c Sat Nov 1 23:56:06 2014 (r1853) @@ -70,3 +70,24 @@ *str = (char)tolower((unsigned char)*str); } +/* FIXME: Find a better solution for MinGW. Maybe wrap strtok_s (C11) if it becomes available */ +#ifdef __MINGW32__ +char* strtok_r(char *str, const char *delim, char **nextp) +{ + if (str == NULL) + str = *nextp; + + str += strspn(str, delim); /* Skip leading delimiters */ + if (*str == '\0') + return NULL; + + char *ret = str; + str += strcspn(str, delim); /* Find end of token */ + if (*str != '\0') + *str++ = '\0'; + + *nextp = str; + return ret; +} +#endif + Modified: trunk/print.c ============================================================================== --- trunk/print.c Sun Oct 19 09:54:27 2014 (r1852) +++ trunk/print.c Sat Nov 1 23:56:06 2014 (r1853) @@ -26,27 +26,6 @@ #include "flash.h" #include "programmer.h" -/* FIXME: Find a better solution for MinGW. Maybe wrap strtok_s (C11) below if it becomes available */ -#ifdef __MINGW32__ -static char* strtok_r(char *str, const char *delim, char **nextp) -{ - if (str == NULL) - str = *nextp; - - str += strspn(str, delim); /* Skip leading delimiters */ - if (*str == '\0') - return NULL; - - char *ret = str; - str += strcspn(str, delim); /* Find end of token */ - if (*str != '\0') - *str++ = '\0'; - - *nextp = str; - return ret; -} -#endif - static const char *test_state_to_text(enum test_state test_state) { switch (test_state) {

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom November 2014