- flashrom - mail.coreboot.org

[PATCH] Tidy up docs before release
by Carl-Daniel Hailfinger 19 Aug '09

19 Aug '09

Tidy up docs before release. Don't mention coreboot.org without context. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-doc_cosmetics/flashrom.8 =================================================================== --- flashrom-doc_cosmetics/flashrom.8 (Revision 687) +++ flashrom-doc_cosmetics/flashrom.8 (Arbeitskopie) @@ -15,10 +15,6 @@ It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, and TSOP40 chips, which use various protocols such as LPC, FWH, parallel flash, or SPI. -.PP -(see -.B http://coreboot.org -for details on coreboot) .SH OPTIONS Please note that the command line interface for flashrom will change before flashrom 1.0. Do not use flashrom in scripts or other automated tools without Index: flashrom-doc_cosmetics/README =================================================================== --- flashrom-doc_cosmetics/README (Revision 687) +++ flashrom-doc_cosmetics/README (Arbeitskopie) @@ -2,19 +2,16 @@ flashrom README ------------------------------------------------------------------------------- -flashrom is a utility for reading, writing, verifying and erasing flash ROM -chips. It's often used to flash BIOS/EFI/coreboot/firmware images in-system -using a supported mainboard, but it also supports flashing of network +flashrom is a utility for detecting, reading, writing, verifying and erasing +flash chips. It is often used to flash BIOS/EFI/coreboot/firmware images +in-system using a supported mainboard, but it also supports flashing of network cards (NICs), SATA controller cards, and other external devices which can program flash chips. -It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, and -TSOP40 chips, which use various protocols such as LPC, FWH, parallel flash, -or SPI. +It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, and TSOP40 +chips, which use various protocols such as LPC, FWH, parallel flash, or SPI. -(see http://coreboot.org for details on coreboot) - Packaging --------- -- http://www.hailfinger.org/

2 2

[commit] r688 - trunk
by svn＠flashrom.org 19 Aug '09

19 Aug '09

Author: hailfinger Date: 2009-08-19 01:50:14 +0200 (Wed, 19 Aug 2009) New Revision: 688 Modified: trunk/README trunk/flashrom.8 Log: Tidy up docs before release. Don't mention coreboot.org without context. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/README =================================================================== --- trunk/README 2009-08-18 17:05:54 UTC (rev 687) +++ trunk/README 2009-08-18 23:50:14 UTC (rev 688) @@ -2,19 +2,16 @@ flashrom README ------------------------------------------------------------------------------- -flashrom is a utility for reading, writing, verifying and erasing flash ROM -chips. It's often used to flash BIOS/EFI/coreboot/firmware images in-system -using a supported mainboard, but it also supports flashing of network +flashrom is a utility for detecting, reading, writing, verifying and erasing +flash chips. It is often used to flash BIOS/EFI/coreboot/firmware images +in-system using a supported mainboard, but it also supports flashing of network cards (NICs), SATA controller cards, and other external devices which can program flash chips. -It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, and -TSOP40 chips, which use various protocols such as LPC, FWH, parallel flash, -or SPI. +It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, and TSOP40 +chips, which use various protocols such as LPC, FWH, parallel flash, or SPI. -(see http://coreboot.org for details on coreboot) - Packaging --------- Modified: trunk/flashrom.8 =================================================================== --- trunk/flashrom.8 2009-08-18 17:05:54 UTC (rev 687) +++ trunk/flashrom.8 2009-08-18 23:50:14 UTC (rev 688) @@ -15,10 +15,6 @@ It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, and TSOP40 chips, which use various protocols such as LPC, FWH, parallel flash, or SPI. -.PP -(see -.B http://coreboot.org -for details on coreboot) .SH OPTIONS Please note that the command line interface for flashrom will change before flashrom 1.0. Do not use flashrom in scripts or other automated tools without

1 0

[commit] r687 - tags
by svn＠flashrom.org 18 Aug '09

18 Aug '09

Author: hailfinger Date: 2009-08-18 19:05:54 +0200 (Tue, 18 Aug 2009) New Revision: 687 Added: tags/flashrom-0.9.1-rc1/ Log: flashrom 0.9.1-rc1 tag Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net>

1 0

new flashchip support for flashrom program information
by nanotonne＠free.fr 18 Aug '09

18 Aug '09

Hi, I send you a information for flashrom additionnal support (please) Flashrom program detect good my mainboard and chipset but don't detect chip flash rom I have tested to force reading with "similar" model" and it work mainboard : ASUS A7V133 chip flash memory : MOSEL V29C51002T (text writed on chip and reported by awflash utility) aparently this chip similar model as "SyncMOS S29C51002T" from your website because i can read fully with flashrom utility but i can't flash it. documentation mainboard is here : http://dlsvr02.asus.com/pub/ASUS/mb/socka/kt133a/a7v133/a7v133-105.pdf documentation chip rom is here : http://www.datasheetcatalog.org/datasheet/mosel/V29C51002T.pdf or here : http://pdf1.alldatasheet.co.kr/datasheet-pdf/view/2313/MOSEL/V29C51002T-90P… thank to add support of this chip , and too add option for flashrom program to force writing with a "similar chip" (know as compatible after research) when chip is manually defined. note : project coreboot is good, but support for usb disk for boot it and keyboard/mouse usb not supported is a big lack to "switch" to this alternative open firmware :-( ... Michael

2 1

flashrom v0.9.0-r670 works with an ASUS KFN4-D16
by Thomas Ward 18 Aug '09

18 Aug '09

I can report that flashrom v0.9.0-r670 works with an ASUS KFN4-D16 to reflash the mainboard bios chip I flashed an ASUS ROM (3.02) and halted the computer and rebooted, computer booted up as normal. next stop is to flash coreboot on this board, I hope to report back in about one month good luck with your project, Tom Ward

1 0

Success: Gigabyte GA-MA78GPM-DS2H
by Erik Haugen Bakke 18 Aug '09

18 Aug '09

Hi, all. Just wanted to confirm that the current SVN version of flashrom works on a Gigabyte GA-MA78GPM-DS2H board. The last time I tried this was about 2 months ago and the flashing failed back then, so this support would have added some time since then. The board was delivered with BIOS revision F3, and I have successfully flashed it with F4 and F5. This is my first success report, so please let me know if you need additional information on the board. Best regards -- Erik H. Bakke __________________________________________________________________________________ Find local businesses and services in your area with Yahoo!7 Local. Get started: http://local.yahoo.com.au

1 0

[PATCH] Fix compilation on Nexenta (Ubuntu/Solaris)
by Carl-Daniel Hailfinger 17 Aug '09

17 Aug '09

Fix compilation on Nexenta which is Ubuntu with a Solaris kernel. This is 0.9.1 material. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-nexenta/Makefile =================================================================== --- flashrom-nexenta/Makefile (Revision 684) +++ flashrom-nexenta/Makefile (Arbeitskopie) @@ -70,7 +70,10 @@ ifeq ($(CONFIG_SERPROG), yes) FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1' OBJS += serprog.o +ifeq ($(OS_ARCH), SunOS) +LIBS += -lsocket endif +endif FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") Index: flashrom-nexenta/README =================================================================== --- flashrom-nexenta/README (Revision 684) +++ flashrom-nexenta/README (Arbeitskopie) @@ -43,7 +43,7 @@ * pciutils * pciutils-devel / pciutils-dev / libpci-dev - * zlib-devel / zlib1g-dev + * zlib-devel / zlib1g-dev (only needed if libpci is static) On FreeBSD, you need the following ports: @@ -58,15 +58,18 @@ gmake +To compile on Nexenta, use: + + make + To compile on Solaris, use: - gmake LDFLAGS="-L$pathtolibpci -lpci -lz" CC="gcc -I$pathtopciheaders" \ - CFLAGS=-O2 + gmake LDFLAGS="-L$pathtolibpci" CC="gcc -I$pathtopciheaders" CFLAGS=-O2 To compile on DragonFly BSD, use: ln -s /usr/pkg/include/pciutils pci - gmake CFLAGS=-I. LDFLAGS="-L/usr/pkg/lib -lpci -lz" + gmake CFLAGS=-I. LDFLAGS="-L/usr/pkg/lib" To compile and run on Darwin/Mac OS X: -- http://www.hailfinger.org/

2 2

[commit] r686 - trunk
by svn＠flashrom.org 17 Aug '09

17 Aug '09

Author: hailfinger Date: 2009-08-17 18:30:53 +0200 (Mon, 17 Aug 2009) New Revision: 686 Modified: trunk/Makefile trunk/README Log: Fix compilation on Nexenta which is Ubuntu with a Solaris kernel. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2009-08-13 23:23:37 UTC (rev 685) +++ trunk/Makefile 2009-08-17 16:30:53 UTC (rev 686) @@ -70,7 +70,10 @@ ifeq ($(CONFIG_SERPROG), yes) FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1' OBJS += serprog.o +ifeq ($(OS_ARCH), SunOS) +LIBS += -lsocket endif +endif FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") Modified: trunk/README =================================================================== --- trunk/README 2009-08-13 23:23:37 UTC (rev 685) +++ trunk/README 2009-08-17 16:30:53 UTC (rev 686) @@ -43,7 +43,7 @@ * pciutils * pciutils-devel / pciutils-dev / libpci-dev - * zlib-devel / zlib1g-dev + * zlib-devel / zlib1g-dev (only needed if libpci is static) On FreeBSD, you need the following ports: @@ -58,15 +58,18 @@ gmake +To compile on Nexenta, use: + + make + To compile on Solaris, use: - gmake LDFLAGS="-L$pathtolibpci -lpci -lz" CC="gcc -I$pathtopciheaders" \ - CFLAGS=-O2 + gmake LDFLAGS="-L$pathtolibpci" CC="gcc -I$pathtopciheaders" CFLAGS=-O2 To compile on DragonFly BSD, use: ln -s /usr/pkg/include/pciutils pci - gmake CFLAGS=-I. LDFLAGS="-L/usr/pkg/lib -lpci -lz" + gmake CFLAGS=-I. LDFLAGS="-L/usr/pkg/lib" To compile and run on Darwin/Mac OS X:

1 0

[PATCH] ICH6+ FWH IDSEL override
by Carl-Daniel Hailfinger 17 Aug '09

17 Aug '09

Allow the user to override FWH IDSEL on ICH6 and later. Usage: flashrom -p internal=fwh_idsel=0 Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-ich6_fwh_idsel/chipset_enable.c =================================================================== --- flashrom-ich6_fwh_idsel/chipset_enable.c (Revision 683) +++ flashrom-ich6_fwh_idsel/chipset_enable.c (Arbeitskopie) @@ -203,6 +203,7 @@ { uint32_t fwh_conf; int i; + char *idsel = NULL; /* Ignore all legacy ranges below 1 MB. */ /* FWH_SEL1 */ @@ -232,6 +233,19 @@ (0xff0 + i) * 0x100000, (fwh_conf >> i) & 0x1 ? "en" : "dis"); + if (programmer_param) + idsel = strstr(programmer_param, "fwh_idsel="); + + if (idsel) { + idsel += strlen("fwh_idsel="); + fwh_conf = (uint32_t)strtoul(idsel, NULL, 0); + + /* FIXME: Need to undo this on shutdown. */ + printf("\nSetting IDSEL=0x%x for top 16 MB", fwh_conf); + pci_write_long(dev, 0xd0, fwh_conf); + pci_write_word(dev, 0xd4, fwh_conf); + } + return enable_flash_ich(dev, name, 0xdc); } -- http://www.hailfinger.org/

3 6

[commit] r685 - trunk
by svn＠flashrom.org 14 Aug '09

14 Aug '09

Author: hailfinger Date: 2009-08-14 01:23:37 +0200 (Fri, 14 Aug 2009) New Revision: 685 Modified: trunk/chipset_enable.c Log: Allow the user to override FWH IDSEL on ICH6 and later. Usage: flashrom -p internal=fwh_idsel=0 Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Log: flashrom v0.9.0-r670 coreboot table found at 0xcf7f3c00. Vendor ID: KONTRON, part ID: 986LCD-M Found chipset "Intel ICH7/ICH7R", enabling flash write... Setting IDSEL=0 for top 8 MBOK. This chipset supports the following protocols: LPC,FWH. Disabling flash write protection for board "Kontron 986LCD-M"... OK. Calibrating delay loop... OK. Found chip "SST SST49LF016C" (2048 KB, FWH) at physical address 0xffe00000. No operations were specified. Acked-by: Chris Kinney <cmkinne(a)sandia.gov> Modified: trunk/chipset_enable.c =================================================================== --- trunk/chipset_enable.c 2009-08-13 11:38:44 UTC (rev 684) +++ trunk/chipset_enable.c 2009-08-13 23:23:37 UTC (rev 685) @@ -203,6 +203,7 @@ { uint32_t fwh_conf; int i; + char *idsel = NULL; /* Ignore all legacy ranges below 1 MB. */ /* FWH_SEL1 */ @@ -232,6 +233,19 @@ (0xff0 + i) * 0x100000, (fwh_conf >> i) & 0x1 ? "en" : "dis"); + if (programmer_param) + idsel = strstr(programmer_param, "fwh_idsel="); + + if (idsel) { + idsel += strlen("fwh_idsel="); + fwh_conf = (uint32_t)strtoul(idsel, NULL, 0); + + /* FIXME: Need to undo this on shutdown. */ + printf("\nSetting IDSEL=0x%x for top 16 MB", fwh_conf); + pci_write_long(dev, 0xd0, fwh_conf); + pci_write_word(dev, 0xd4, fwh_conf); + } + return enable_flash_ich(dev, name, 0xdc); }

1 0

Re: [flashrom] flashrom compatibility
by Carl-Daniel Hailfinger 13 Aug '09

13 Aug '09

Hi James. On 13.08.2009 16:39, James Li wrote: > Is flashrom utility executable inside QNX4 environment ? > I do not know, but can you test if it compiles in QNX4? If it does not compile, we can work with you to add QNX4 support. flashrom needs: - physical RAM access (/dev/mem on Linux) - I/O port access (inb/outb) - MSR access for GeodeLX boards Regards, Carl-Daniel -- http://www.hailfinger.org/

1 0

flashrom compatibility
by James Li 13 Aug '09

13 Aug '09

Hi, Is flashrom utility executable inside QNX4 environment ? Thanks

1 0

[PATCH] Only list available programers in usage()
by Carl-Daniel Hailfinger 13 Aug '09

13 Aug '09

Generate the usage message by walking the list of available programmers. This makes sure compiled out programmers are not listed. Tested, usage output is identical to the hardcoded variant. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-programmer_usagemessage/flashrom.c =================================================================== --- flashrom-programmer_usagemessage/flashrom.c (Revision 680) +++ flashrom-programmer_usagemessage/flashrom.c (Arbeitskopie) @@ -486,6 +486,11 @@ void usage(const char *name) { + const char *pname; + int pnamelen; + int remaining = 0; + enum programmer p; + printf("usage: %s [-VfLzhR] [-E|-r file|-w file|-v file] [-c chipname]\n" " [-m [vendor:]part] [-l file] [-i image] [-p programmer]\n\n", name); @@ -508,9 +513,33 @@ " -i | --image <name>: only flash image name from flash layout\n" " -L | --list-supported: print supported devices\n" " -z | --list-supported-wiki: print supported devices in wiki syntax\n" - " -p | --programmer <name>: specify the programmer device\n" - " (internal, dummy, nic3com, satasii,\n" - " it87spi, ft2232spi, serprog)\n" + " -p | --programmer <name>: specify the programmer device"); + + for (p = 0; p < PROGRAMMER_INVALID; p++) { + pname = programmer_table[p].name; + pnamelen = strlen(pname); + if (remaining - pnamelen - 2 < 0) { + printf("\n "); + remaining = 43; + } else { + printf(" "); + remaining--; + } + if (p == 0) { + printf("("); + remaining--; + } + printf("%s", pname); + remaining -= pnamelen; + if (p < PROGRAMMER_INVALID - 1) { + printf(","); + remaining--; + } else { + printf(")\n"); + } + } + + printf( " -h | --help: print this help text\n" " -R | --version: print the version (release)\n" "\nYou can specify one of -E, -r, -w, -v or no operation. If no operation is\n" -- http://www.hailfinger.org/

2 3

[commit] r684 - trunk
by svn＠flashrom.org 13 Aug '09

13 Aug '09

Author: hailfinger Date: 2009-08-13 13:38:44 +0200 (Thu, 13 Aug 2009) New Revision: 684 Modified: trunk/flashrom.c Log: Generate the usage message by walking the list of available programmers. This makes sure compiled out programmers are not listed. Tested, usage output is identical to the hardcoded variant. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-08-12 18:25:24 UTC (rev 683) +++ trunk/flashrom.c 2009-08-13 11:38:44 UTC (rev 684) @@ -488,6 +488,11 @@ void usage(const char *name) { + const char *pname; + int pnamelen; + int remaining = 0; + enum programmer p; + printf("usage: %s [-VfLzhR] [-E|-r file|-w file|-v file] [-c chipname]\n" " [-m [vendor:]part] [-l file] [-i image] [-p programmer]\n\n", name); @@ -510,9 +515,33 @@ " -i | --image <name>: only flash image name from flash layout\n" " -L | --list-supported: print supported devices\n" " -z | --list-supported-wiki: print supported devices in wiki syntax\n" - " -p | --programmer <name>: specify the programmer device\n" - " (internal, dummy, nic3com, satasii,\n" - " it87spi, ft2232spi, serprog)\n" + " -p | --programmer <name>: specify the programmer device"); + + for (p = 0; p < PROGRAMMER_INVALID; p++) { + pname = programmer_table[p].name; + pnamelen = strlen(pname); + if (remaining - pnamelen - 2 < 0) { + printf("\n "); + remaining = 43; + } else { + printf(" "); + remaining--; + } + if (p == 0) { + printf("("); + remaining--; + } + printf("%s", pname); + remaining -= pnamelen; + if (p < PROGRAMMER_INVALID - 1) { + printf(","); + remaining--; + } else { + printf(")\n"); + } + } + + printf( " -h | --help: print this help text\n" " -R | --version: print the version (release)\n" "\nYou can specify one of -E, -r, -w, -v or no operation. If no operation is\n"

1 0

[commit] r683 - trunk
by svn＠flashrom.org 12 Aug '09

12 Aug '09

Author: stepan Date: 2009-08-12 20:25:24 +0200 (Wed, 12 Aug 2009) New Revision: 683 Modified: trunk/board_enable.c Log: oops. MSR accesses in board specific code. I missed those. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/board_enable.c =================================================================== --- trunk/board_enable.c 2009-08-12 16:58:11 UTC (rev 682) +++ trunk/board_enable.c 2009-08-12 18:25:24 UTC (rev 683) @@ -495,51 +495,29 @@ #define DBE6x_BOOT_LOC_FLASH (2) #define DBE6x_BOOT_LOC_FWHUB (3) - unsigned long msr[2]; - int msr_fd; + msr_t msr; unsigned long boot_loc; - msr_fd = open("/dev/cpu/0/msr", O_RDWR); - if (msr_fd == -1) { - perror("open /dev/cpu/0/msr"); + /* Geode only has a single core */ + if (setup_cpu_msr(0)) return -1; - } - if (lseek(msr_fd, DBE6x_MSR_DIVIL_BALL_OPTS, SEEK_SET) == -1) { - perror("lseek"); - close(msr_fd); - return -1; - } + msr = rdmsr(DBE6x_MSR_DIVIL_BALL_OPTS); - if (read(msr_fd, (void *)msr, 8) != 8) { - perror("read"); - close(msr_fd); - return -1; - } - - if ((msr[0] & (DBE6x_BOOT_OP_LATCHED)) == + if ((msr.lo & (DBE6x_BOOT_OP_LATCHED)) == (DBE6x_BOOT_LOC_FWHUB << DBE6x_BOOT_OP_LATCHED_SHIFT)) boot_loc = DBE6x_BOOT_LOC_FWHUB; else boot_loc = DBE6x_BOOT_LOC_FLASH; - msr[0] &= ~(DBE6x_PRI_BOOT_LOC | DBE6x_SEC_BOOT_LOC); - msr[0] |= ((boot_loc << DBE6x_PRI_BOOT_LOC_SHIFT) | + msr.lo &= ~(DBE6x_PRI_BOOT_LOC | DBE6x_SEC_BOOT_LOC); + msr.lo |= ((boot_loc << DBE6x_PRI_BOOT_LOC_SHIFT) | (boot_loc << DBE6x_SEC_BOOT_LOC_SHIFT)); - if (lseek(msr_fd, DBE6x_MSR_DIVIL_BALL_OPTS, SEEK_SET) == -1) { - perror("lseek"); - close(msr_fd); - return -1; - } + wrmsr(DBE6x_MSR_DIVIL_BALL_OPTS, msr); - if (write(msr_fd, (void *)msr, 8) != 8) { - perror("write"); - close(msr_fd); - return -1; - } + cleanup_cpu_msr(); - close(msr_fd); return 0; }

1 0

[commit] r682 - trunk
by svn＠flashrom.org 12 Aug '09

12 Aug '09

Author: libv Date: 2009-08-12 18:58:11 +0200 (Wed, 12 Aug 2009) New Revision: 682 Modified: trunk/board_enable.c Log: Board enable for Asus P4P800-E Deluxe. Raises what seems to be gpio21. Uses host controller and Promise Raid Controller for a unique match. Signed-off-by: Luc Verhaegen <libv(a)skynet.be> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Tested-by: Bojan Radakovic <crnibojan(a)gmail.com> Modified: trunk/board_enable.c =================================================================== --- trunk/board_enable.c 2009-08-12 16:17:41 UTC (rev 681) +++ trunk/board_enable.c 2009-08-12 16:58:11 UTC (rev 682) @@ -888,6 +888,32 @@ } /** + * Suited for Asus P4P800-E: Intel Intel 865PE + ICH5R. + */ +static int board_asus_p4p800(const char *name) +{ + struct pci_dev *dev; + uint16_t base; + uint8_t tmp; + + dev = pci_dev_find(0x8086, 0x24D0); /* Intel ICH5R ISA Bridge */ + if (!dev) { + fprintf(stderr, "\nERROR: Intel ICH5R ISA Bridge not found.\n"); + return -1; + } + + /* get PM IO base */ + base = pci_read_long(dev, 0x58) & 0x0000FFC0; + + /* Raise GPIO 21 */ + tmp = INB(base + 0x0E); + tmp |= 0x20; + OUTB(tmp, base + 0x0E); + + return 0; +} + +/** * We use 2 sets of IDs here, you're free to choose which is which. This * is to provide a very high degree of certainty when matching a board on * the basis of subsystem/card IDs. As not every vendor handles @@ -920,6 +946,7 @@ {0x1106, 0x3189, 0x1043, 0x807F, 0x1106, 0x3177, 0x1043, 0x808C, NULL, NULL, "ASUS", "A7V8X", board_asus_a7v8x}, {0x1106, 0x3177, 0x1043, 0x80A1, 0x1106, 0x3205, 0x1043, 0x8118, NULL, NULL, "ASUS", "A7V8X-MX SE", board_asus_a7v8x_mx}, {0x8086, 0x1a30, 0x1043, 0x8070, 0x8086, 0x244b, 0x1043, 0x8028, NULL, NULL, "ASUS", "P4B266", ich2_gpio22_raise}, + {0x8086, 0x2570, 0x1043, 0x80F2, 0x105A, 0x3373, 0x1043, 0x80F5, NULL, NULL, "ASUS", "P4P800-E Deluxe", board_asus_p4p800}, {0x10B9, 0x1541, 0, 0, 0x10B9, 0x1533, 0, 0, "asus", "p5a", "ASUS", "P5A", board_asus_p5a}, {0x1106, 0x3149, 0x1565, 0x3206, 0x1106, 0x3344, 0x1565, 0x1202, NULL, NULL, "Biostar", "P4M80-M4", it8705_rom_write_enable}, {0x1106, 0x3038, 0x1019, 0x0996, 0x1106, 0x3177, 0x1019, 0x0996, NULL, NULL, "Elitegroup", "K7VTA3", it8705f_write_enable_2e},

1 0

flashrom 0.9.1 soon
by Carl-Daniel Hailfinger 12 Aug '09

12 Aug '09

Hi, I'd like to tag flashrom 0.9.1 soon. Preliminary release announcement is here: http://www.coreboot.org/Flashrom/0.9.1 The release announcement will be transferred to flashrom.org at the time of release. Patches I'd like to have in 0.9.1: Acked with modifications, commit needed: - fix MSR code in flashrom Ack needed: - Use correct programmer fallback functions - Improve error messages, protect the user TODO: - Don't list programmers which weren't compiled in. This means #if inside the usage message and in a lot of other places. Makefile tweaking needed as well. - Don't error out if chipset initialization returned with a warning. - Document serprog usage in the man page. - Loads of testing. I hope to get the pending patches listed above committed tomorrow, then tag 0.9.1-rc1 to give packagers a base to work with and test. No new features will be merged between 0.9.1-rc1 and 0.9.1. (I do have one neat new SPI bitbang feature pending, but that one has to wait as well.) I'd rather get 0.9.1 out before the Opensuse package update deadline. That means we also make the Ubuntu Karmic deadline. Thoughts? Comments? Regards, Carl-Daniel -- http://www.hailfinger.org/

2 3

[PATCH] Allow to compile out serprog completely
by Carl-Daniel Hailfinger 12 Aug '09

12 Aug '09

Allow to compile out serprog completely. If CONFIG_SERPROG is not set, no stubs and no data of serprog will remain. Side benefit: This kills a few dozen lines of code. r678, r679 and r680 made this possible. Once "Only list available programers in usage()" is committed, even the usage message will be adjusted automatically. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-serprog_compileout/flash.h =================================================================== --- flashrom-serprog_compileout/flash.h (Revision 680) +++ flashrom-serprog_compileout/flash.h (Arbeitskopie) @@ -87,7 +87,9 @@ PROGRAMMER_SATASII, PROGRAMMER_IT87SPI, PROGRAMMER_FT2232SPI, +#if SERPROG_SUPPORT == 1 PROGRAMMER_SERPROG, +#endif PROGRAMMER_INVALID /* This must always be the last entry. */ }; Index: flashrom-serprog_compileout/serprog.c =================================================================== --- flashrom-serprog_compileout/serprog.c (Revision 680) +++ flashrom-serprog_compileout/serprog.c (Arbeitskopie) @@ -23,9 +23,6 @@ #include <stdlib.h> #include <unistd.h> #include "flash.h" - -#if SERPROG_SUPPORT == 1 - #include <string.h> #include <ctype.h> #include <fcntl.h> @@ -774,42 +771,3 @@ sp_opbuf_usage += 5; sp_prev_was_write = 0; } - -#else - -int serprog_init(void) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -int serprog_shutdown(void) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -void serprog_chip_writeb(uint8_t val, chipaddr addr) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -uint8_t serprog_chip_readb(const chipaddr addr) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -void serprog_chip_readn(uint8_t *buf, const chipaddr addr, size_t len) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -void serprog_delay(int delay) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} -#endif Index: flashrom-serprog_compileout/Makefile =================================================================== --- flashrom-serprog_compileout/Makefile (Revision 680) +++ flashrom-serprog_compileout/Makefile (Arbeitskopie) @@ -49,7 +49,7 @@ sst49lfxxxc.o sst_fwhub.o layout.o cbtable.o flashchips.o physmap.o \ flashrom.o w39v080fa.o sharplhf00l04.o w29ee011.o spi.o it87spi.o \ ichspi.o w39v040c.o sb600spi.o wbsio_spi.o m29f002.o internal.o \ - dummyflasher.o pcidev.o nic3com.o satasii.o ft2232_spi.o serprog.o \ + dummyflasher.o pcidev.o nic3com.o satasii.o ft2232_spi.o \ print.o all: pciutils features dep $(PROGRAM) @@ -64,15 +64,21 @@ SVNDEF := -D'FLASHROM_VERSION="$(VERSION)"' -$(PROGRAM): $(OBJS) - $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS) +# Always enable serprog for now. Needs to be disabled on Windows. +CONFIG_SERPROG = yes -FEATURE_CFLAGS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") -# Always enable serprog for now. Needs to be disabled on Windows. +ifeq ($(CONFIG_SERPROG), yes) FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1' +OBJS += serprog.o +endif -FEATURE_LIBS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi") +FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") +FEATURE_LIBS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi") + +$(PROGRAM): $(OBJS) + $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS) + # TAROPTIONS reduces information leakage from the packager's system. # If other tar programs support command line arguments for setting uid/gid of # stored files, they can be handled here as well. Index: flashrom-serprog_compileout/flashrom.c =================================================================== --- flashrom-serprog_compileout/flashrom.c (Revision 680) +++ flashrom-serprog_compileout/flashrom.c (Arbeitskopie) @@ -139,6 +139,7 @@ .delay = internal_delay, }, +#if SERPROG_SUPPORT == 1 { .name = "serprog", .init = serprog_init, @@ -155,6 +156,7 @@ .chip_writen = fallback_chip_writen, .delay = serprog_delay, }, +#endif {}, /* This entry corresponds to PROGRAMMER_INVALID. */ }; -- http://www.hailfinger.org/

2 2

[commit] r681 - trunk
by svn＠flashrom.org 12 Aug '09

12 Aug '09

Author: hailfinger Date: 2009-08-12 18:17:41 +0200 (Wed, 12 Aug 2009) New Revision: 681 Modified: trunk/Makefile trunk/flash.h trunk/flashrom.c trunk/serprog.c Log: Allow to compile out serprog completely. If CONFIG_SERPROG is not set, no stubs and no data of serprog will remain. Side benefit: This kills a few dozen lines of code. r678, r679 and r680 made this possible. Once "Only list available programers in usage()" is committed, even the usage message will be adjusted automatically. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2009-08-12 14:34:35 UTC (rev 680) +++ trunk/Makefile 2009-08-12 16:17:41 UTC (rev 681) @@ -49,7 +49,7 @@ sst49lfxxxc.o sst_fwhub.o layout.o cbtable.o flashchips.o physmap.o \ flashrom.o w39v080fa.o sharplhf00l04.o w29ee011.o spi.o it87spi.o \ ichspi.o w39v040c.o sb600spi.o wbsio_spi.o m29f002.o internal.o \ - dummyflasher.o pcidev.o nic3com.o satasii.o ft2232_spi.o serprog.o \ + dummyflasher.o pcidev.o nic3com.o satasii.o ft2232_spi.o \ print.o all: pciutils features dep $(PROGRAM) @@ -64,15 +64,21 @@ SVNDEF := -D'FLASHROM_VERSION="$(VERSION)"' -$(PROGRAM): $(OBJS) - $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS) +# Always enable serprog for now. Needs to be disabled on Windows. +CONFIG_SERPROG = yes -FEATURE_CFLAGS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") -# Always enable serprog for now. Needs to be disabled on Windows. +ifeq ($(CONFIG_SERPROG), yes) FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1' +OBJS += serprog.o +endif -FEATURE_LIBS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi") +FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") +FEATURE_LIBS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi") + +$(PROGRAM): $(OBJS) + $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS) + # TAROPTIONS reduces information leakage from the packager's system. # If other tar programs support command line arguments for setting uid/gid of # stored files, they can be handled here as well. Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-08-12 14:34:35 UTC (rev 680) +++ trunk/flash.h 2009-08-12 16:17:41 UTC (rev 681) @@ -87,7 +87,9 @@ PROGRAMMER_SATASII, PROGRAMMER_IT87SPI, PROGRAMMER_FT2232SPI, +#if SERPROG_SUPPORT == 1 PROGRAMMER_SERPROG, +#endif PROGRAMMER_INVALID /* This must always be the last entry. */ }; Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-08-12 14:34:35 UTC (rev 680) +++ trunk/flashrom.c 2009-08-12 16:17:41 UTC (rev 681) @@ -139,6 +139,7 @@ .delay = internal_delay, }, +#if SERPROG_SUPPORT == 1 { .name = "serprog", .init = serprog_init, @@ -155,6 +156,7 @@ .chip_writen = fallback_chip_writen, .delay = serprog_delay, }, +#endif {}, /* This entry corresponds to PROGRAMMER_INVALID. */ }; Modified: trunk/serprog.c =================================================================== --- trunk/serprog.c 2009-08-12 14:34:35 UTC (rev 680) +++ trunk/serprog.c 2009-08-12 16:17:41 UTC (rev 681) @@ -23,9 +23,6 @@ #include <stdlib.h> #include <unistd.h> #include "flash.h" - -#if SERPROG_SUPPORT == 1 - #include <string.h> #include <ctype.h> #include <fcntl.h> @@ -774,42 +771,3 @@ sp_opbuf_usage += 5; sp_prev_was_write = 0; } - -#else - -int serprog_init(void) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -int serprog_shutdown(void) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -void serprog_chip_writeb(uint8_t val, chipaddr addr) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -uint8_t serprog_chip_readb(const chipaddr addr) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -void serprog_chip_readn(uint8_t *buf, const chipaddr addr, size_t len) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -void serprog_delay(int delay) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} -#endif

1 0

[PATCH] Use programmer name field
by Carl-Daniel Hailfinger 12 Aug '09

12 Aug '09

Use programmer.name to match the --programmer parameter instead of hardcoding the name of every single programmer in main(). -p dummyfoo won't be mistaken for -p dummy anymore. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-programmer_name/flash.h =================================================================== --- flashrom-programmer_name/flash.h (Revision 679) +++ flashrom-programmer_name/flash.h (Arbeitskopie) @@ -88,6 +88,7 @@ PROGRAMMER_IT87SPI, PROGRAMMER_FT2232SPI, PROGRAMMER_SERPROG, + PROGRAMMER_INVALID /* This must always be the last entry. */ }; extern enum programmer programmer; Index: flashrom-programmer_name/flashrom.c =================================================================== --- flashrom-programmer_name/flashrom.c (Revision 679) +++ flashrom-programmer_name/flashrom.c (Arbeitskopie) @@ -38,6 +38,7 @@ const struct programmer_entry programmer_table[] = { { + .name = "internal", .init = internal_init, .shutdown = internal_shutdown, .map_flash_region = physmap, @@ -54,6 +55,7 @@ }, { + .name = "dummy", .init = dummy_init, .shutdown = dummy_shutdown, .map_flash_region = dummy_map, @@ -70,6 +72,7 @@ }, { + .name = "nic3com", .init = nic3com_init, .shutdown = nic3com_shutdown, .map_flash_region = fallback_map, @@ -86,6 +89,7 @@ }, { + .name = "satasii", .init = satasii_init, .shutdown = satasii_shutdown, .map_flash_region = fallback_map, @@ -102,6 +106,7 @@ }, { + .name = "it87spi", .init = it87spi_init, .shutdown = fallback_shutdown, .map_flash_region = fallback_map, @@ -118,6 +123,7 @@ }, { + .name = "ft2232spi", .init = ft2232_spi_init, .shutdown = fallback_shutdown, .map_flash_region = fallback_map, @@ -134,6 +140,7 @@ }, { + .name = "serprog", .init = serprog_init, .shutdown = serprog_shutdown, .map_flash_region = fallback_map, @@ -149,7 +156,7 @@ .delay = serprog_delay, }, - {}, + {}, /* This entry corresponds to PROGRAMMER_INVALID. */ }; int programmer_init(void) @@ -523,6 +530,8 @@ FILE *image; /* Probe for up to three flash chips. */ struct flashchip *flash, *flashes[3]; + const char *name; + int namelen; int opt; int option_index = 0; int force = 0; @@ -565,6 +574,12 @@ printf_debug("%s\n", argv[i]); } + /* Safety check. */ + if (ARRAY_SIZE(programmer_table) - 1 != PROGRAMMER_INVALID) { + fprintf(stderr, "Programmer table miscompilation!\n"); + exit(1); + } + setbuf(stdout, NULL); while ((opt = getopt_long(argc, argv, "rRwvnVEfc:m:l:i:p:Lzh", long_options, &option_index)) != EOF) { @@ -641,35 +656,28 @@ list_supported_wiki = 1; break; case 'p': - if (strncmp(optarg, "internal", 8) == 0) { - programmer = PROGRAMMER_INTERNAL; - if (optarg[8] == '=') - programmer_param = strdup(optarg + 9); - } else if (strncmp(optarg, "dummy", 5) == 0) { - programmer = PROGRAMMER_DUMMY; - if (optarg[5] == '=') - programmer_param = strdup(optarg + 6); - } else if (strncmp(optarg, "nic3com", 7) == 0) { - programmer = PROGRAMMER_NIC3COM; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else if (strncmp(optarg, "satasii", 7) == 0) { - programmer = PROGRAMMER_SATASII; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else if (strncmp(optarg, "it87spi", 7) == 0) { - programmer = PROGRAMMER_IT87SPI; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else if (strncmp(optarg, "ft2232spi", 9) == 0) { - programmer = PROGRAMMER_FT2232SPI; - if (optarg[9] == '=') - programmer_param = strdup(optarg + 10); - } else if (strncmp(optarg, "serprog", 7) == 0) { - programmer = PROGRAMMER_SERPROG; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else { + for (programmer = 0; programmer < PROGRAMMER_INVALID; programmer++) { + name = programmer_table[programmer].name; + namelen = strlen(name); + if (strncmp(optarg, name, namelen) == 0) { + switch (optarg[namelen]) { + case '=': + programmer_param = strdup(optarg + namelen + 1); + break; + case '\0': + break; + default: + /* The continue refers to the + * for loop. It is here to be + * able to differentiate between + * foo and foobar. + */ + continue; + } + break; + } + } + if (programmer == PROGRAMMER_INVALID) { printf("Error: Unknown programmer.\n"); exit(1); } -- http://www.hailfinger.org/

2 2

[commit] r680 - trunk
by svn＠flashrom.org 12 Aug '09

12 Aug '09

Author: hailfinger Date: 2009-08-12 16:34:35 +0200 (Wed, 12 Aug 2009) New Revision: 680 Modified: trunk/flash.h trunk/flashrom.c Log: Use programmer.name to match the --programmer parameter instead of hardcoding the name of every single programmer in main(). -p dummyfoo won't be mistaken for -p dummy anymore. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-08-12 13:32:56 UTC (rev 679) +++ trunk/flash.h 2009-08-12 14:34:35 UTC (rev 680) @@ -88,6 +88,7 @@ PROGRAMMER_IT87SPI, PROGRAMMER_FT2232SPI, PROGRAMMER_SERPROG, + PROGRAMMER_INVALID /* This must always be the last entry. */ }; extern enum programmer programmer; Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-08-12 13:32:56 UTC (rev 679) +++ trunk/flashrom.c 2009-08-12 14:34:35 UTC (rev 680) @@ -38,6 +38,7 @@ const struct programmer_entry programmer_table[] = { { + .name = "internal", .init = internal_init, .shutdown = internal_shutdown, .map_flash_region = physmap, @@ -54,6 +55,7 @@ }, { + .name = "dummy", .init = dummy_init, .shutdown = dummy_shutdown, .map_flash_region = dummy_map, @@ -70,6 +72,7 @@ }, { + .name = "nic3com", .init = nic3com_init, .shutdown = nic3com_shutdown, .map_flash_region = fallback_map, @@ -86,6 +89,7 @@ }, { + .name = "satasii", .init = satasii_init, .shutdown = satasii_shutdown, .map_flash_region = fallback_map, @@ -102,6 +106,7 @@ }, { + .name = "it87spi", .init = it87spi_init, .shutdown = fallback_shutdown, .map_flash_region = fallback_map, @@ -118,6 +123,7 @@ }, { + .name = "ft2232spi", .init = ft2232_spi_init, .shutdown = fallback_shutdown, .map_flash_region = fallback_map, @@ -134,6 +140,7 @@ }, { + .name = "serprog", .init = serprog_init, .shutdown = serprog_shutdown, .map_flash_region = fallback_map, @@ -149,7 +156,7 @@ .delay = serprog_delay, }, - {}, + {}, /* This entry corresponds to PROGRAMMER_INVALID. */ }; int programmer_init(void) @@ -523,6 +530,8 @@ FILE *image; /* Probe for up to three flash chips. */ struct flashchip *flash, *flashes[3]; + const char *name; + int namelen; int opt; int option_index = 0; int force = 0; @@ -565,6 +574,12 @@ printf_debug("%s\n", argv[i]); } + /* Safety check. */ + if (ARRAY_SIZE(programmer_table) - 1 != PROGRAMMER_INVALID) { + fprintf(stderr, "Programmer table miscompilation!\n"); + exit(1); + } + setbuf(stdout, NULL); while ((opt = getopt_long(argc, argv, "rRwvnVEfc:m:l:i:p:Lzh", long_options, &option_index)) != EOF) { @@ -641,35 +656,28 @@ list_supported_wiki = 1; break; case 'p': - if (strncmp(optarg, "internal", 8) == 0) { - programmer = PROGRAMMER_INTERNAL; - if (optarg[8] == '=') - programmer_param = strdup(optarg + 9); - } else if (strncmp(optarg, "dummy", 5) == 0) { - programmer = PROGRAMMER_DUMMY; - if (optarg[5] == '=') - programmer_param = strdup(optarg + 6); - } else if (strncmp(optarg, "nic3com", 7) == 0) { - programmer = PROGRAMMER_NIC3COM; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else if (strncmp(optarg, "satasii", 7) == 0) { - programmer = PROGRAMMER_SATASII; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else if (strncmp(optarg, "it87spi", 7) == 0) { - programmer = PROGRAMMER_IT87SPI; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else if (strncmp(optarg, "ft2232spi", 9) == 0) { - programmer = PROGRAMMER_FT2232SPI; - if (optarg[9] == '=') - programmer_param = strdup(optarg + 10); - } else if (strncmp(optarg, "serprog", 7) == 0) { - programmer = PROGRAMMER_SERPROG; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else { + for (programmer = 0; programmer < PROGRAMMER_INVALID; programmer++) { + name = programmer_table[programmer].name; + namelen = strlen(name); + if (strncmp(optarg, name, namelen) == 0) { + switch (optarg[namelen]) { + case '=': + programmer_param = strdup(optarg + namelen + 1); + break; + case '\0': + break; + default: + /* The continue refers to the + * for loop. It is here to be + * able to differentiate between + * foo and foobar. + */ + continue; + } + break; + } + } + if (programmer == PROGRAMMER_INVALID) { printf("Error: Unknown programmer.\n"); exit(1); }

1 0

[PATCH] Common parameter variable for all programmers
by Carl-Daniel Hailfinger 12 Aug '09

12 Aug '09

Use a common parameter variable for all programmers. This allows us to reduce #ifdef clauses a lot if we compile out some programmers completely. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-programmer_common_param/flash.h =================================================================== --- flashrom-programmer_common_param/flash.h (Revision 678) +++ flashrom-programmer_common_param/flash.h (Arbeitskopie) @@ -277,7 +277,7 @@ const char *device_name; }; uint32_t pcidev_validate(struct pci_dev *dev, struct pcidev_status *devs); -uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs); +uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs, char *pcidev_bdf); /* print.c */ char *flashbuses_to_text(enum chipbustype bustype); @@ -350,7 +350,6 @@ #endif /* dummyflasher.c */ -extern char *dummytype; int dummy_init(void); int dummy_shutdown(void); void *dummy_map(const char *descr, unsigned long phys_addr, size_t len); @@ -383,13 +382,13 @@ /* ft2232_spi.c */ #define FTDI_FT2232H 0x6010 #define FTDI_FT4232H 0x6011 -extern char *ft2232spi_param; int ft2232_spi_init(void); int ft2232_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int ft2232_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf); /* flashrom.c */ +extern char *programmer_param; extern int verbose; extern const char *flashrom_version; #define printf_debug(x...) { if (verbose) printf(x); } @@ -399,7 +398,6 @@ int max(int a, int b); 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); -extern char *pcidev_bdf; char *strcat_realloc(char *dest, const char *src); #define OK 0 @@ -507,7 +505,6 @@ int ich_spi_send_multicommand(struct spi_command *spicommands); /* it87spi.c */ -extern char *it87opts; extern uint16_t it8716f_flashport; void enter_conf_mode_ite(uint16_t port); void exit_conf_mode_ite(uint16_t port); @@ -628,7 +625,6 @@ int write_stm50flw0x0x(struct flashchip *flash, uint8_t *buf); /* serprog.c */ -extern char *serprog_param; int serprog_init(void); int serprog_shutdown(void); void serprog_chip_writeb(uint8_t val, chipaddr addr); Index: flashrom-programmer_common_param/it87spi.c =================================================================== --- flashrom-programmer_common_param/it87spi.c (Revision 678) +++ flashrom-programmer_common_param/it87spi.c (Arbeitskopie) @@ -31,7 +31,6 @@ #define ITE_SUPERIO_PORT1 0x2e #define ITE_SUPERIO_PORT2 0x4e -char *it87opts = NULL; uint16_t it8716f_flashport = 0; /* use fast 33MHz SPI (<>0) or slow 16MHz (0) */ int fast_spi = 1; @@ -95,11 +94,11 @@ flashport = sio_read(port, 0x64) << 8; flashport |= sio_read(port, 0x65); printf("Serial flash port 0x%04x\n", flashport); - if (it87opts && !strlen(it87opts)) { - free(it87opts); - it87opts = NULL; + if (programmer_param && !strlen(programmer_param)) { + free(programmer_param); + programmer_param = NULL; } - if (it87opts && (portpos = strstr(it87opts, "port="))) { + if (programmer_param && (portpos = strstr(programmer_param, "port="))) { portpos += 5; flashport = strtol(portpos, (char **)NULL, 0); printf("Forcing serial flash port 0x%04x\n", flashport); Index: flashrom-programmer_common_param/pcidev.c =================================================================== --- flashrom-programmer_common_param/pcidev.c (Revision 678) +++ flashrom-programmer_common_param/pcidev.c (Arbeitskopie) @@ -26,7 +26,6 @@ uint32_t io_base_addr; struct pci_access *pacc; struct pci_filter filter; -char *pcidev_bdf = NULL; struct pci_dev *pcidev_dev = NULL; uint32_t pcidev_validate(struct pci_dev *dev, struct pcidev_status *devs) @@ -58,7 +57,7 @@ return 0; } -uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs) +uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs, char *pcidev_bdf) { struct pci_dev *dev; char *msg = NULL; Index: flashrom-programmer_common_param/serprog.c =================================================================== --- flashrom-programmer_common_param/serprog.c (Revision 678) +++ flashrom-programmer_common_param/serprog.c (Arbeitskopie) @@ -19,8 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <string.h> +#include <stdio.h> #include <stdlib.h> +#include <unistd.h> +#include "flash.h" + +#if SERPROG_SUPPORT == 1 + +#include <string.h> #include <ctype.h> #include <fcntl.h> #include <sys/types.h> @@ -31,16 +37,9 @@ #include <netdb.h> #include <sys/stat.h> #include <errno.h> -#include <stdio.h> -#include <unistd.h> #include <inttypes.h> #include <termios.h> -#include "flash.h" -char *serprog_param = NULL; - -#if SERPROG_SUPPORT == 1 - #define MSGHEADER "serprog:" #define S_ACK 0x06 @@ -431,15 +430,15 @@ char *dev; printf_debug("%s\n", __func__); /* the parameter is either of format "/dev/device:baud" or "ip:port" */ - if ((!serprog_param) || (!strlen(serprog_param))) { + if ((!programmer_param) || (!strlen(programmer_param))) { nodevice: fprintf(stderr, "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(serprog_param, ":"); - len = num - serprog_param; + num = strstr(programmer_param, ":"); + len = num - programmer_param; if (!len) goto nodevice; if (!num) { fprintf(stderr, @@ -447,15 +446,15 @@ "Use flashrom -p serprog=/dev/device:baud or flashrom -p serprog=ip:port\n"); exit(1); } - len = num - serprog_param; + len = num - programmer_param; dev = malloc(len + 1); if (!dev) sp_die("Error: memory allocation failure"); - memcpy(dev, serprog_param, len); + memcpy(dev, programmer_param, len); dev[len] = 0; num = strdup(num + 1); if (!num) sp_die("Error: memory allocation failure"); - free(serprog_param); - serprog_param = NULL; + free(programmer_param); + programmer_param = NULL; if (dev[0] == '/') sp_fd = sp_openserport(dev, atoi(num)); else sp_fd = sp_opensocket(dev, atoi(num)); Index: flashrom-programmer_common_param/nic3com.c =================================================================== --- flashrom-programmer_common_param/nic3com.c (Revision 678) +++ flashrom-programmer_common_param/nic3com.c (Arbeitskopie) @@ -58,7 +58,7 @@ { get_io_perms(); - io_base_addr = pcidev_init(PCI_VENDOR_ID_3COM, nics_3com); + io_base_addr = pcidev_init(PCI_VENDOR_ID_3COM, nics_3com, programmer_param); id = pcidev_dev->device_id; /* 3COM 3C90xB cards need a special fixup. */ @@ -94,7 +94,7 @@ OUTL(internal_conf, io_base_addr + INTERNAL_CONFIG); } - free(pcidev_bdf); + free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Index: flashrom-programmer_common_param/ft2232_spi.c =================================================================== --- flashrom-programmer_common_param/ft2232_spi.c (Revision 678) +++ flashrom-programmer_common_param/ft2232_spi.c (Arbeitskopie) @@ -26,8 +26,6 @@ #include "flash.h" #include "spi.h" -char *ft2232spi_param = NULL; - #if FT2232_SPI_SUPPORT == 1 #include <ftdi.h> @@ -83,16 +81,16 @@ return EXIT_FAILURE; } - if (ft2232spi_param && !strlen(ft2232spi_param)) { - free(ft2232spi_param); - ft2232spi_param = NULL; + if (programmer_param && !strlen(programmer_param)) { + free(programmer_param); + programmer_param = NULL; } - if (ft2232spi_param) { - if (strstr(ft2232spi_param, "2232")) + if (programmer_param) { + if (strstr(programmer_param, "2232")) ft2232_type = FTDI_FT2232H; - if (strstr(ft2232spi_param, "4232")) + if (strstr(programmer_param, "4232")) ft2232_type = FTDI_FT4232H; - portpos = strstr(ft2232spi_param, "port="); + portpos = strstr(programmer_param, "port="); if (portpos) { portpos += 5; switch (toupper(*portpos)) { @@ -107,7 +105,7 @@ "using default.\n"); } } - free(ft2232spi_param); + free(programmer_param); } printf_debug("Using device type %s ", (ft2232_type == FTDI_FT2232H) ? "2232H" : "4232H"); Index: flashrom-programmer_common_param/satasii.c =================================================================== --- flashrom-programmer_common_param/satasii.c (Revision 678) +++ flashrom-programmer_common_param/satasii.c (Arbeitskopie) @@ -47,7 +47,7 @@ get_io_perms(); - pcidev_init(PCI_VENDOR_ID_SII, satas_sii); + pcidev_init(PCI_VENDOR_ID_SII, satas_sii, programmer_param); id = pcidev_dev->device_id; if ((id == 0x3132) || (id == 0x3124)) { @@ -71,7 +71,7 @@ int satasii_shutdown(void) { - free(pcidev_bdf); + free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Index: flashrom-programmer_common_param/dummyflasher.c =================================================================== --- flashrom-programmer_common_param/dummyflasher.c (Revision 678) +++ flashrom-programmer_common_param/dummyflasher.c (Arbeitskopie) @@ -24,45 +24,43 @@ #include <sys/types.h> #include "flash.h" -char *dummytype = NULL; - int dummy_init(void) { int i; printf_debug("%s\n", __func__); /* "all" is equivalent to specifying no type. */ - if (dummytype && (!strcmp(dummytype, "all"))) { - free(dummytype); - dummytype = NULL; + if (programmer_param && (!strcmp(programmer_param, "all"))) { + free(programmer_param); + programmer_param = NULL; } - if (!dummytype) - dummytype = strdup("parallel,lpc,fwh,spi"); + if (!programmer_param) + programmer_param = strdup("parallel,lpc,fwh,spi"); /* Convert the parameters to lowercase. */ - for (i = 0; dummytype[i] != '\0'; i++) - dummytype[i] = (char)tolower(dummytype[i]); + for (i = 0; programmer_param[i] != '\0'; i++) + programmer_param[i] = (char)tolower(programmer_param[i]); buses_supported = CHIP_BUSTYPE_NONE; - if (strstr(dummytype, "parallel")) { + if (strstr(programmer_param, "parallel")) { buses_supported |= CHIP_BUSTYPE_PARALLEL; printf_debug("Enabling support for %s flash.\n", "parallel"); } - if (strstr(dummytype, "lpc")) { + if (strstr(programmer_param, "lpc")) { buses_supported |= CHIP_BUSTYPE_LPC; printf_debug("Enabling support for %s flash.\n", "LPC"); } - if (strstr(dummytype, "fwh")) { + if (strstr(programmer_param, "fwh")) { buses_supported |= CHIP_BUSTYPE_FWH; printf_debug("Enabling support for %s flash.\n", "FWH"); } - if (strstr(dummytype, "spi")) { + if (strstr(programmer_param, "spi")) { buses_supported |= CHIP_BUSTYPE_SPI; spi_controller = SPI_CONTROLLER_DUMMY; printf_debug("Enabling support for %s flash.\n", "SPI"); } if (buses_supported == CHIP_BUSTYPE_NONE) printf_debug("Support for all flash bus types disabled.\n"); - free(dummytype); + free(programmer_param); return 0; } Index: flashrom-programmer_common_param/flashrom.c =================================================================== --- flashrom-programmer_common_param/flashrom.c (Revision 678) +++ flashrom-programmer_common_param/flashrom.c (Arbeitskopie) @@ -34,6 +34,7 @@ char *chip_to_probe = NULL; int verbose = 0; enum programmer programmer = PROGRAMMER_INTERNAL; +char *programmer_param = NULL; const struct programmer_entry programmer_table[] = { { @@ -642,30 +643,32 @@ case 'p': if (strncmp(optarg, "internal", 8) == 0) { programmer = PROGRAMMER_INTERNAL; + if (optarg[8] == '=') + programmer_param = strdup(optarg + 9); } else if (strncmp(optarg, "dummy", 5) == 0) { programmer = PROGRAMMER_DUMMY; if (optarg[5] == '=') - dummytype = strdup(optarg + 6); + programmer_param = strdup(optarg + 6); } else if (strncmp(optarg, "nic3com", 7) == 0) { programmer = PROGRAMMER_NIC3COM; if (optarg[7] == '=') - pcidev_bdf = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else if (strncmp(optarg, "satasii", 7) == 0) { programmer = PROGRAMMER_SATASII; if (optarg[7] == '=') - pcidev_bdf = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else if (strncmp(optarg, "it87spi", 7) == 0) { programmer = PROGRAMMER_IT87SPI; if (optarg[7] == '=') - it87opts = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else if (strncmp(optarg, "ft2232spi", 9) == 0) { programmer = PROGRAMMER_FT2232SPI; if (optarg[9] == '=') - ft2232spi_param = strdup(optarg + 10); + programmer_param = strdup(optarg + 10); } else if (strncmp(optarg, "serprog", 7) == 0) { programmer = PROGRAMMER_SERPROG; if (optarg[7] == '=') - serprog_param = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else { printf("Error: Unknown programmer.\n"); exit(1); -- http://www.hailfinger.org/

2 2

[commit] r679 - trunk
by svn＠flashrom.org 12 Aug '09

12 Aug '09

Author: hailfinger Date: 2009-08-12 15:32:56 +0200 (Wed, 12 Aug 2009) New Revision: 679 Modified: trunk/dummyflasher.c trunk/flash.h trunk/flashrom.c trunk/ft2232_spi.c trunk/it87spi.c trunk/nic3com.c trunk/pcidev.c trunk/satasii.c trunk/serprog.c Log: Use a common parameter variable for all programmers. This allows us to reduce #ifdef clauses a lot if we compile out some programmers completely. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/dummyflasher.c =================================================================== --- trunk/dummyflasher.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/dummyflasher.c 2009-08-12 13:32:56 UTC (rev 679) @@ -24,45 +24,43 @@ #include <sys/types.h> #include "flash.h" -char *dummytype = NULL; - int dummy_init(void) { int i; printf_debug("%s\n", __func__); /* "all" is equivalent to specifying no type. */ - if (dummytype && (!strcmp(dummytype, "all"))) { - free(dummytype); - dummytype = NULL; + if (programmer_param && (!strcmp(programmer_param, "all"))) { + free(programmer_param); + programmer_param = NULL; } - if (!dummytype) - dummytype = strdup("parallel,lpc,fwh,spi"); + if (!programmer_param) + programmer_param = strdup("parallel,lpc,fwh,spi"); /* Convert the parameters to lowercase. */ - for (i = 0; dummytype[i] != '\0'; i++) - dummytype[i] = (char)tolower(dummytype[i]); + for (i = 0; programmer_param[i] != '\0'; i++) + programmer_param[i] = (char)tolower(programmer_param[i]); buses_supported = CHIP_BUSTYPE_NONE; - if (strstr(dummytype, "parallel")) { + if (strstr(programmer_param, "parallel")) { buses_supported |= CHIP_BUSTYPE_PARALLEL; printf_debug("Enabling support for %s flash.\n", "parallel"); } - if (strstr(dummytype, "lpc")) { + if (strstr(programmer_param, "lpc")) { buses_supported |= CHIP_BUSTYPE_LPC; printf_debug("Enabling support for %s flash.\n", "LPC"); } - if (strstr(dummytype, "fwh")) { + if (strstr(programmer_param, "fwh")) { buses_supported |= CHIP_BUSTYPE_FWH; printf_debug("Enabling support for %s flash.\n", "FWH"); } - if (strstr(dummytype, "spi")) { + if (strstr(programmer_param, "spi")) { buses_supported |= CHIP_BUSTYPE_SPI; spi_controller = SPI_CONTROLLER_DUMMY; printf_debug("Enabling support for %s flash.\n", "SPI"); } if (buses_supported == CHIP_BUSTYPE_NONE) printf_debug("Support for all flash bus types disabled.\n"); - free(dummytype); + free(programmer_param); return 0; } Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/flash.h 2009-08-12 13:32:56 UTC (rev 679) @@ -277,7 +277,7 @@ const char *device_name; }; uint32_t pcidev_validate(struct pci_dev *dev, struct pcidev_status *devs); -uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs); +uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs, char *pcidev_bdf); /* print.c */ char *flashbuses_to_text(enum chipbustype bustype); @@ -350,7 +350,6 @@ #endif /* dummyflasher.c */ -extern char *dummytype; int dummy_init(void); int dummy_shutdown(void); void *dummy_map(const char *descr, unsigned long phys_addr, size_t len); @@ -383,13 +382,13 @@ /* ft2232_spi.c */ #define FTDI_FT2232H 0x6010 #define FTDI_FT4232H 0x6011 -extern char *ft2232spi_param; int ft2232_spi_init(void); int ft2232_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int ft2232_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf); /* flashrom.c */ +extern char *programmer_param; extern int verbose; extern const char *flashrom_version; #define printf_debug(x...) { if (verbose) printf(x); } @@ -399,7 +398,6 @@ int max(int a, int b); 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); -extern char *pcidev_bdf; char *strcat_realloc(char *dest, const char *src); #define OK 0 @@ -507,7 +505,6 @@ int ich_spi_send_multicommand(struct spi_command *spicommands); /* it87spi.c */ -extern char *it87opts; extern uint16_t it8716f_flashport; void enter_conf_mode_ite(uint16_t port); void exit_conf_mode_ite(uint16_t port); @@ -628,7 +625,6 @@ int write_stm50flw0x0x(struct flashchip *flash, uint8_t *buf); /* serprog.c */ -extern char *serprog_param; int serprog_init(void); int serprog_shutdown(void); void serprog_chip_writeb(uint8_t val, chipaddr addr); Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/flashrom.c 2009-08-12 13:32:56 UTC (rev 679) @@ -34,6 +34,7 @@ char *chip_to_probe = NULL; int verbose = 0; enum programmer programmer = PROGRAMMER_INTERNAL; +char *programmer_param = NULL; const struct programmer_entry programmer_table[] = { { @@ -642,30 +643,32 @@ case 'p': if (strncmp(optarg, "internal", 8) == 0) { programmer = PROGRAMMER_INTERNAL; + if (optarg[8] == '=') + programmer_param = strdup(optarg + 9); } else if (strncmp(optarg, "dummy", 5) == 0) { programmer = PROGRAMMER_DUMMY; if (optarg[5] == '=') - dummytype = strdup(optarg + 6); + programmer_param = strdup(optarg + 6); } else if (strncmp(optarg, "nic3com", 7) == 0) { programmer = PROGRAMMER_NIC3COM; if (optarg[7] == '=') - pcidev_bdf = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else if (strncmp(optarg, "satasii", 7) == 0) { programmer = PROGRAMMER_SATASII; if (optarg[7] == '=') - pcidev_bdf = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else if (strncmp(optarg, "it87spi", 7) == 0) { programmer = PROGRAMMER_IT87SPI; if (optarg[7] == '=') - it87opts = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else if (strncmp(optarg, "ft2232spi", 9) == 0) { programmer = PROGRAMMER_FT2232SPI; if (optarg[9] == '=') - ft2232spi_param = strdup(optarg + 10); + programmer_param = strdup(optarg + 10); } else if (strncmp(optarg, "serprog", 7) == 0) { programmer = PROGRAMMER_SERPROG; if (optarg[7] == '=') - serprog_param = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else { printf("Error: Unknown programmer.\n"); exit(1); Modified: trunk/ft2232_spi.c =================================================================== --- trunk/ft2232_spi.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/ft2232_spi.c 2009-08-12 13:32:56 UTC (rev 679) @@ -26,8 +26,6 @@ #include "flash.h" #include "spi.h" -char *ft2232spi_param = NULL; - #if FT2232_SPI_SUPPORT == 1 #include <ftdi.h> @@ -83,16 +81,16 @@ return EXIT_FAILURE; } - if (ft2232spi_param && !strlen(ft2232spi_param)) { - free(ft2232spi_param); - ft2232spi_param = NULL; + if (programmer_param && !strlen(programmer_param)) { + free(programmer_param); + programmer_param = NULL; } - if (ft2232spi_param) { - if (strstr(ft2232spi_param, "2232")) + if (programmer_param) { + if (strstr(programmer_param, "2232")) ft2232_type = FTDI_FT2232H; - if (strstr(ft2232spi_param, "4232")) + if (strstr(programmer_param, "4232")) ft2232_type = FTDI_FT4232H; - portpos = strstr(ft2232spi_param, "port="); + portpos = strstr(programmer_param, "port="); if (portpos) { portpos += 5; switch (toupper(*portpos)) { @@ -107,7 +105,7 @@ "using default.\n"); } } - free(ft2232spi_param); + free(programmer_param); } printf_debug("Using device type %s ", (ft2232_type == FTDI_FT2232H) ? "2232H" : "4232H"); Modified: trunk/it87spi.c =================================================================== --- trunk/it87spi.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/it87spi.c 2009-08-12 13:32:56 UTC (rev 679) @@ -31,7 +31,6 @@ #define ITE_SUPERIO_PORT1 0x2e #define ITE_SUPERIO_PORT2 0x4e -char *it87opts = NULL; uint16_t it8716f_flashport = 0; /* use fast 33MHz SPI (<>0) or slow 16MHz (0) */ int fast_spi = 1; @@ -95,11 +94,11 @@ flashport = sio_read(port, 0x64) << 8; flashport |= sio_read(port, 0x65); printf("Serial flash port 0x%04x\n", flashport); - if (it87opts && !strlen(it87opts)) { - free(it87opts); - it87opts = NULL; + if (programmer_param && !strlen(programmer_param)) { + free(programmer_param); + programmer_param = NULL; } - if (it87opts && (portpos = strstr(it87opts, "port="))) { + if (programmer_param && (portpos = strstr(programmer_param, "port="))) { portpos += 5; flashport = strtol(portpos, (char **)NULL, 0); printf("Forcing serial flash port 0x%04x\n", flashport); Modified: trunk/nic3com.c =================================================================== --- trunk/nic3com.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/nic3com.c 2009-08-12 13:32:56 UTC (rev 679) @@ -58,7 +58,7 @@ { get_io_perms(); - io_base_addr = pcidev_init(PCI_VENDOR_ID_3COM, nics_3com); + io_base_addr = pcidev_init(PCI_VENDOR_ID_3COM, nics_3com, programmer_param); id = pcidev_dev->device_id; /* 3COM 3C90xB cards need a special fixup. */ @@ -94,7 +94,7 @@ OUTL(internal_conf, io_base_addr + INTERNAL_CONFIG); } - free(pcidev_bdf); + free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Modified: trunk/pcidev.c =================================================================== --- trunk/pcidev.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/pcidev.c 2009-08-12 13:32:56 UTC (rev 679) @@ -26,7 +26,6 @@ uint32_t io_base_addr; struct pci_access *pacc; struct pci_filter filter; -char *pcidev_bdf = NULL; struct pci_dev *pcidev_dev = NULL; uint32_t pcidev_validate(struct pci_dev *dev, struct pcidev_status *devs) @@ -58,7 +57,7 @@ return 0; } -uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs) +uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs, char *pcidev_bdf) { struct pci_dev *dev; char *msg = NULL; Modified: trunk/satasii.c =================================================================== --- trunk/satasii.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/satasii.c 2009-08-12 13:32:56 UTC (rev 679) @@ -47,7 +47,7 @@ get_io_perms(); - pcidev_init(PCI_VENDOR_ID_SII, satas_sii); + pcidev_init(PCI_VENDOR_ID_SII, satas_sii, programmer_param); id = pcidev_dev->device_id; if ((id == 0x3132) || (id == 0x3124)) { @@ -71,7 +71,7 @@ int satasii_shutdown(void) { - free(pcidev_bdf); + free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Modified: trunk/serprog.c =================================================================== --- trunk/serprog.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/serprog.c 2009-08-12 13:32:56 UTC (rev 679) @@ -19,8 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <string.h> +#include <stdio.h> #include <stdlib.h> +#include <unistd.h> +#include "flash.h" + +#if SERPROG_SUPPORT == 1 + +#include <string.h> #include <ctype.h> #include <fcntl.h> #include <sys/types.h> @@ -31,16 +37,9 @@ #include <netdb.h> #include <sys/stat.h> #include <errno.h> -#include <stdio.h> -#include <unistd.h> #include <inttypes.h> #include <termios.h> -#include "flash.h" -char *serprog_param = NULL; - -#if SERPROG_SUPPORT == 1 - #define MSGHEADER "serprog:" #define S_ACK 0x06 @@ -431,15 +430,15 @@ char *dev; printf_debug("%s\n", __func__); /* the parameter is either of format "/dev/device:baud" or "ip:port" */ - if ((!serprog_param) || (!strlen(serprog_param))) { + if ((!programmer_param) || (!strlen(programmer_param))) { nodevice: fprintf(stderr, "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(serprog_param, ":"); - len = num - serprog_param; + num = strstr(programmer_param, ":"); + len = num - programmer_param; if (!len) goto nodevice; if (!num) { fprintf(stderr, @@ -447,15 +446,15 @@ "Use flashrom -p serprog=/dev/device:baud or flashrom -p serprog=ip:port\n"); exit(1); } - len = num - serprog_param; + len = num - programmer_param; dev = malloc(len + 1); if (!dev) sp_die("Error: memory allocation failure"); - memcpy(dev, serprog_param, len); + memcpy(dev, programmer_param, len); dev[len] = 0; num = strdup(num + 1); if (!num) sp_die("Error: memory allocation failure"); - free(serprog_param); - serprog_param = NULL; + free(programmer_param); + programmer_param = NULL; if (dev[0] == '/') sp_fd = sp_openserport(dev, atoi(num)); else sp_fd = sp_opensocket(dev, atoi(num));

1 0

[PATCH] Use correct programmer fallback functions
by Carl-Daniel Hailfinger 12 Aug '09

12 Aug '09

FT2232 and IT87 programmers used functions of the dummy programmer instead of fallback functions. The dummy programmer is a "real" programmer with possible side effects and its functions should not be abused by other programmers. Make FT2232 and IT87 use official fallback functions instead. Create fallback_shutdown(). Create fallback_chip_writeb(). Convert the programmer #defines to an enum. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-fallback/flash.h =================================================================== --- flashrom-fallback/flash.h (Revision 674) +++ flashrom-fallback/flash.h (Arbeitskopie) @@ -80,15 +80,18 @@ typedef unsigned long chipaddr; -extern int programmer; -#define PROGRAMMER_INTERNAL 0x00 -#define PROGRAMMER_DUMMY 0x01 -#define PROGRAMMER_NIC3COM 0x02 -#define PROGRAMMER_SATASII 0x03 -#define PROGRAMMER_IT87SPI 0x04 -#define PROGRAMMER_FT2232SPI 0x05 -#define PROGRAMMER_SERPROG 0x06 +enum programmer { + PROGRAMMER_INTERNAL, + PROGRAMMER_DUMMY, + PROGRAMMER_NIC3COM, + PROGRAMMER_SATASII, + PROGRAMMER_IT87SPI, + PROGRAMMER_FT2232SPI, + PROGRAMMER_SERPROG, +}; +extern enum programmer programmer; + struct programmer_entry { const char *vendor; const char *name; @@ -325,8 +328,10 @@ uint16_t mmio_readw(void *addr); uint32_t mmio_readl(void *addr); void internal_delay(int usecs); +int fallback_shutdown(void); void *fallback_map(const char *descr, unsigned long phys_addr, size_t len); void fallback_unmap(void *virt_addr, size_t len); +void fallback_chip_writeb(uint8_t val, chipaddr addr); void fallback_chip_writew(uint16_t val, chipaddr addr); void fallback_chip_writel(uint32_t val, chipaddr addr); void fallback_chip_writen(uint8_t *buf, chipaddr addr, size_t len); @@ -375,7 +380,6 @@ int ft2232_spi_init(void); int ft2232_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int ft2232_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); -int ft2232_spi_write1(struct flashchip *flash, uint8_t *buf); int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf); /* flashrom.c */ Index: flashrom-fallback/flashrom.c =================================================================== --- flashrom-fallback/flashrom.c (Revision 674) +++ flashrom-fallback/flashrom.c (Arbeitskopie) @@ -33,7 +33,7 @@ const char *flashrom_version = FLASHROM_VERSION; char *chip_to_probe = NULL; int verbose = 0; -int programmer = PROGRAMMER_INTERNAL; +enum programmer programmer = PROGRAMMER_INTERNAL; const struct programmer_entry programmer_table[] = { { @@ -102,14 +102,14 @@ { .init = it87spi_init, - .shutdown = dummy_shutdown, - .map_flash_region = dummy_map, - .unmap_flash_region = dummy_unmap, + .shutdown = fallback_shutdown, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, .chip_readb = dummy_chip_readb, .chip_readw = fallback_chip_readw, .chip_readl = fallback_chip_readl, .chip_readn = fallback_chip_readn, - .chip_writeb = dummy_chip_writeb, + .chip_writeb = fallback_chip_writeb, .chip_writew = fallback_chip_writew, .chip_writel = fallback_chip_writel, .chip_writen = fallback_chip_writen, @@ -118,19 +118,20 @@ { .init = ft2232_spi_init, - .shutdown = dummy_shutdown, - .map_flash_region = dummy_map, - .unmap_flash_region = dummy_unmap, + .shutdown = fallback_shutdown, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, .chip_readb = dummy_chip_readb, .chip_readw = fallback_chip_readw, .chip_readl = fallback_chip_readl, .chip_readn = fallback_chip_readn, - .chip_writeb = dummy_chip_writeb, + .chip_writeb = fallback_chip_writeb, .chip_writew = fallback_chip_writew, .chip_writel = fallback_chip_writel, .chip_writen = fallback_chip_writen, .delay = internal_delay, }, + { .init = serprog_init, .shutdown = serprog_shutdown, Index: flashrom-fallback/internal.c =================================================================== --- flashrom-fallback/internal.c (Revision 674) +++ flashrom-fallback/internal.c (Arbeitskopie) @@ -218,6 +218,12 @@ } } +/* Fallback shutdown() for programmers which don't need special handling */ +int fallback_shutdown(void) +{ + return 0; +} + /* Fallback map() for programmers which don't need special handling */ void *fallback_map(const char *descr, unsigned long phys_addr, size_t len) { @@ -229,6 +235,11 @@ { } +/* No-op fallback for drivers not supporting addr/data pair accesses */ +void fallback_chip_writeb(uint8_t val, chipaddr addr) +{ +} + /* Little-endian fallback for drivers not supporting 16 bit accesses */ void fallback_chip_writew(uint16_t val, chipaddr addr) { -- http://www.hailfinger.org/

2 2

[PATCH] fix MSR code in flashrom
by Stefan Reinauer 12 Aug '09

12 Aug '09

See patch... With this flashrom won't try to open /dev/cpu/x/msr on non-linux OSes... Stefan -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/ Registergericht: Amtsgericht Freiburg • HRB 7656 Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866

2 4

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom