flashrom

flashrom@flashrom.org

3 participants
9188 discussions

[PATCH] Fix strict aliasing in serprog
by Carl-Daniel Hailfinger 04 Sep '09

04 Sep '09

Fix strict aliasing in serprog. Initialize the sockaddr,sockaddr_in union directly instead of running memset later. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-strict_aliasing/serprog.c =================================================================== --- flashrom-strict_aliasing/serprog.c (revision 714) +++ flashrom-strict_aliasing/serprog.c (working copy) @@ -105,7 +105,7 @@ { int flag = 1; struct hostent *hostPtr = NULL; - struct sockaddr_in sp; + union { struct sockaddr_in si; struct sockaddr s; } sp = {}; int sock; printf_debug(MSGHEADER "IP %s port %d\n", ip, port); sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -117,11 +117,10 @@ if (NULL == hostPtr) sp_die("Error: cannot resolve"); } - memset(&sp, 0, sizeof(sp)); - sp.sin_family = AF_INET; - sp.sin_port = htons(port); - (void)memcpy(&sp.sin_addr, hostPtr->h_addr, hostPtr->h_length); - if (connect(sock, (struct sockaddr *)&sp, sizeof(sp)) < 0) { + sp.si.sin_family = AF_INET; + sp.si.sin_port = htons(port); + (void)memcpy(&sp.si.sin_addr, hostPtr->h_addr, hostPtr->h_length); + if (connect(sock, &sp.s, sizeof(sp.si)) < 0) { close(sock); sp_die("Error: serprog cannot connect"); } -- http://www.hailfinger.org/

1 1

[commit] r715 - trunk
by svn＠flashrom.org 04 Sep '09

04 Sep '09

Author: hailfinger Date: 2009-09-05 03:10:23 +0200 (Sat, 05 Sep 2009) New Revision: 715 Modified: trunk/serprog.c Log: Fix strict aliasing in serprog. Initialize the sockaddr,sockaddr_in union directly instead of running memset later. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/serprog.c =================================================================== --- trunk/serprog.c 2009-09-04 13:57:07 UTC (rev 714) +++ trunk/serprog.c 2009-09-05 01:10:23 UTC (rev 715) @@ -105,7 +105,7 @@ { int flag = 1; struct hostent *hostPtr = NULL; - struct sockaddr_in sp; + union { struct sockaddr_in si; struct sockaddr s; } sp = {}; int sock; printf_debug(MSGHEADER "IP %s port %d\n", ip, port); sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -117,11 +117,10 @@ if (NULL == hostPtr) sp_die("Error: cannot resolve"); } - memset(&sp, 0, sizeof(sp)); - sp.sin_family = AF_INET; - sp.sin_port = htons(port); - (void)memcpy(&sp.sin_addr, hostPtr->h_addr, hostPtr->h_length); - if (connect(sock, (struct sockaddr *)&sp, sizeof(sp)) < 0) { + sp.si.sin_family = AF_INET; + sp.si.sin_port = htons(port); + (void)memcpy(&sp.si.sin_addr, hostPtr->h_addr, hostPtr->h_length); + if (connect(sock, &sp.s, sizeof(sp.si)) < 0) { close(sock); sp_die("Error: serprog cannot connect"); }

1 0

pending patches
by Carl-Daniel Hailfinger 04 Sep '09

04 Sep '09

We have loads of pending patches and I'd like to reduce them to a manageable number. I plan to review everything not written by me unless it needs testing on real hardware. A list of pending patches is available here: http://patchwork.coreboot.org/project/flashrom/list/ The patch name listed in patchwork is basically the subject of the mail containing the patch. Regards, Carl-Daniel -- http://www.hailfinger.org/

3 2

[commit] r714 - trunk
by svn＠flashrom.org 04 Sep '09

04 Sep '09

Author: stepan Date: 2009-09-04 15:57:07 +0200 (Fri, 04 Sep 2009) New Revision: 714 Modified: trunk/physmap.c Log: fix for gcc 4.4 strict aliasing rules. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/physmap.c =================================================================== --- trunk/physmap.c 2009-09-02 23:27:45 UTC (rev 713) +++ trunk/physmap.c 2009-09-04 13:57:07 UTC (rev 714) @@ -133,7 +133,7 @@ msr_t rdmsr(int addr) { - uint8_t buf[8]; + uint32_t buf[2]; msr_t msr = { 0xffffffff, 0xffffffff }; if (lseek(fd_msr, (off_t) addr, SEEK_SET) == -1) { @@ -143,8 +143,8 @@ } if (read(fd_msr, buf, 8) == 8) { - msr.lo = *(uint32_t *)buf; - msr.hi = *(uint32_t *)(buf + 4); + msr.lo = buf[0]; + msr.hi = buf[1]; return msr; }

1 0

[PATCH] Add Suport for Dr.Kaiser PC-Waechter
by TURBO J 04 Sep '09

04 Sep '09

Hi, this patch adds support for a PCI "flash memory card" named "Dr. Kaiser PC-Waechter". The Vendor sold different designs under that name, the patch works with the one that has an ACTEL FPGA as PCI-to-Flash bridge. The Flash chip is a "Macronix MX29F001B" (128 KB, Parallel) soldered directly to the PCB. Flash operations (PROBE, READ, ERASE, WRITE) work as expected, btw. I had to modify pcidev.c a bit: This card has 0x0000000 at PCI_BASE_ADDRESS_0 because it uses PCI_BASE_ADDRESS_2 instead. -- TURBO J ps. Unrelated issue: My OpenSUSE 11.2 Beta Box needs "make CFLAGS=-fno-strict-aliasing" GCC is "gcc version 4.4.1 [gcc-4_4-branch revision 149935] (SUSE Linux)" Signed-off-by: TURBO J <turboj(a)gmx.de> Index: flash.h =================================================================== --- flash.h (Revision 710) +++ flash.h (Arbeitskopie) @@ -84,6 +84,7 @@ PROGRAMMER_INTERNAL, PROGRAMMER_DUMMY, PROGRAMMER_NIC3COM, + PROGRAMMER_DRKAISER, PROGRAMMER_SATASII, PROGRAMMER_IT87SPI, #if FT2232_SPI_SUPPORT == 1 @@ -387,6 +388,15 @@ uint8_t nic3com_chip_readb(const chipaddr addr); extern struct pcidev_status nics_3com[]; +/* drkaiser.c */ + +int drkaiser_init(void); +int drkaiser_shutdown(void); +void drkaiser_chip_writeb(uint8_t val, chipaddr addr); +uint8_t drkaiser_chip_readb(const chipaddr addr); + +extern struct pcidev_status drkaiser_pcidev[]; + /* satasii.c */ int satasii_init(void); int satasii_shutdown(void); Index: drkaiser.c =================================================================== --- drkaiser.c (Revision 0) +++ drkaiser.c (Revision 0) @@ -0,0 +1,76 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2009 TURBO J <turboj(a)web.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include "flash.h" +#define PCI_VENDOR_ID_DRKAISER 0x1803 +#define PCI_DEVICE_ID_DRKAISER_ACTEL 0x5057 + + +struct pcidev_status drkaiser_pcidev[] = { + {0x1803, 0x5057,PCI_OK,"Dr.Kaiser","PC-Waechter (Actel FPGA)"}, + {}, +}; + +#define PCI_MAGIC_DRKAISER_ADR 0x50 +#define PCI_MAGIC_DRKAISER_VALUE 0xA971 + +uint8_t * drkaiser_mem; + +int drkaiser_init(void) +{ + get_io_perms(); + pcidev_init(PCI_VENDOR_ID_DRKAISER, drkaiser_pcidev, programmer_param); + + // Write Magic Register to enable FLASH Write + pci_write_word(pcidev_dev,PCI_MAGIC_DRKAISER_ADR, PCI_MAGIC_DRKAISER_VALUE); + + // Map 128KB Flash Memory Window + drkaiser_mem=physmap("Dr.Kaiser PC-Waechter FLASH Memory", + pci_read_long(pcidev_dev,PCI_BASE_ADDRESS_2), 128*1024); + + buses_supported = CHIP_BUSTYPE_PARALLEL; + return 0; +} + +int drkaiser_shutdown(void) +{ + // Write protect the Flash again + pci_write_word(pcidev_dev,PCI_MAGIC_DRKAISER_ADR, 0); + free(programmer_param); + pci_cleanup(pacc); + release_io_perms(); + return 0; +}; + + +void drkaiser_chip_writeb(uint8_t val, chipaddr addr) +{ + mmio_writeb(val, drkaiser_mem+addr ); +} + +uint8_t drkaiser_chip_readb(const chipaddr addr) +{ + return mmio_readb(drkaiser_mem + addr ); +} + + + Index: pcidev.c =================================================================== --- pcidev.c (Revision 710) +++ pcidev.c (Arbeitskopie) @@ -39,6 +39,9 @@ /* Don't use dev->base_addr[0], won't work on older libpci. */ addr = pci_read_long(dev, PCI_BASE_ADDRESS_0) & ~0x03; + + /* Dr. Kaiser has BASE_ADDRESS_0 = 0x000 */ + if (!addr) addr= pci_read_long(dev, PCI_BASE_ADDRESS_2) & ~0x03; printf("Found \"%s %s\" (%04x:%04x, BDF %02x:%02x.%x).\n", devs[i].vendor_name, devs[i].device_name, dev->vendor_id, Index: Makefile =================================================================== --- Makefile (Revision 710) +++ Makefile (Arbeitskopie) @@ -50,7 +50,7 @@ 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 \ - print.o + print.o drkaiser.o all: pciutils features dep $(PROGRAM) Index: flashrom.c =================================================================== --- flashrom.c (Revision 710) +++ flashrom.c (Arbeitskopie) @@ -87,7 +87,24 @@ .chip_writen = fallback_chip_writen, .delay = internal_delay, }, + { + .name = "drkaiser", + .init = drkaiser_init, + .shutdown = drkaiser_shutdown, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .chip_readb = drkaiser_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = drkaiser_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, + .delay = internal_delay, + }, + { .name = "satasii", .init = satasii_init, @@ -747,6 +764,7 @@ printf("\nSupported PCI devices flashrom can use " "as programmer:\n\n"); print_supported_pcidevs(nics_3com); + print_supported_pcidevs(drkaiser_pcidev); print_supported_pcidevs(satas_sii); exit(0); }

5 6

[commit] r713 - trunk
by svn＠flashrom.org 02 Sep '09

02 Sep '09

Author: uwe Date: 2009-09-03 01:27:45 +0200 (Thu, 03 Sep 2009) New Revision: 713 Added: trunk/drkaiser.c Log: Add drkaiser.c which was accidentally omitted in the last commit. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Added: trunk/drkaiser.c =================================================================== --- trunk/drkaiser.c (rev 0) +++ trunk/drkaiser.c 2009-09-02 23:27:45 UTC (rev 713) @@ -0,0 +1,79 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2009 TURBO J <turboj(a)web.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include "flash.h" + +#define PCI_VENDOR_ID_DRKAISER 0x1803 + +#define PCI_MAGIC_DRKAISER_ADDR 0x50 +#define PCI_MAGIC_DRKAISER_VALUE 0xa971 + +struct pcidev_status drkaiser_pcidev[] = { + {0x1803, 0x5057, PCI_OK, "Dr. Kaiser", "PC-Waechter (Actel FPGA)"}, + {}, +}; + +uint8_t *drkaiser_bar; + +int drkaiser_init(void) +{ + uint32_t addr; + + get_io_perms(); + pcidev_init(PCI_VENDOR_ID_DRKAISER, PCI_BASE_ADDRESS_2, + drkaiser_pcidev, programmer_param); + + /* Write magic register to enable flash write. */ + pci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, + PCI_MAGIC_DRKAISER_VALUE); + + /* TODO: Mask lower bits? How many? 3? 7? */ + addr = pci_read_long(pcidev_dev, PCI_BASE_ADDRESS_2) & ~0x03; + + /* Map 128KB flash memory window. */ + drkaiser_bar = physmap("Dr. Kaiser PC-Waechter flash memory", + addr, 128 * 1024); + + buses_supported = CHIP_BUSTYPE_PARALLEL; + return 0; +} + +int drkaiser_shutdown(void) +{ + /* Write protect the flash again. */ + pci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, 0); + free(programmer_param); + pci_cleanup(pacc); + release_io_perms(); + return 0; +}; + +void drkaiser_chip_writeb(uint8_t val, chipaddr addr) +{ + mmio_writeb(val, drkaiser_bar + addr); +} + +uint8_t drkaiser_chip_readb(const chipaddr addr) +{ + return mmio_readb(drkaiser_bar + addr); +}

1 0

[commit] r712 - trunk
by svn＠flashrom.org 02 Sep '09

02 Sep '09

Author: uwe Date: 2009-09-03 01:00:46 +0200 (Thu, 03 Sep 2009) New Revision: 712 Modified: trunk/Makefile trunk/flash.h trunk/flashrom.8 trunk/flashrom.c trunk/nic3com.c trunk/pcidev.c trunk/satasii.c Log: Add support for parallel flash on Dr. Kaiser PC-Waechter PCI devices. The vendor sold different designs under that name, the patch works with the one that has an Actel FPGA as PCI-to-Flash bridge. The Flash chip is a "Macronix MX29F001B" (128 KB, parallel) soldered directly to the PCB. Flash operations (PROBE, READ, ERASE, WRITE) work as expected. Signed-off-by: TURBO J <turboj(a)gmx.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2009-09-02 22:09:00 UTC (rev 711) +++ trunk/Makefile 2009-09-02 23:00:46 UTC (rev 712) @@ -50,7 +50,7 @@ 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 \ - print.o + print.o drkaiser.o all: pciutils features dep $(PROGRAM) Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-09-02 22:09:00 UTC (rev 711) +++ trunk/flash.h 2009-09-02 23:00:46 UTC (rev 712) @@ -84,6 +84,7 @@ PROGRAMMER_INTERNAL, PROGRAMMER_DUMMY, PROGRAMMER_NIC3COM, + PROGRAMMER_DRKAISER, PROGRAMMER_SATASII, PROGRAMMER_IT87SPI, #if FT2232_SPI_SUPPORT == 1 @@ -281,8 +282,8 @@ const char *vendor_name; 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, char *pcidev_bdf); +uint32_t pcidev_validate(struct pci_dev *dev, uint32_t bar, struct pcidev_status *devs); +uint32_t pcidev_init(uint16_t vendor_id, uint32_t bar, struct pcidev_status *devs, char *pcidev_bdf); /* print.c */ char *flashbuses_to_text(enum chipbustype bustype); @@ -387,6 +388,13 @@ uint8_t nic3com_chip_readb(const chipaddr addr); extern struct pcidev_status nics_3com[]; +/* drkaiser.c */ +int drkaiser_init(void); +int drkaiser_shutdown(void); +void drkaiser_chip_writeb(uint8_t val, chipaddr addr); +uint8_t drkaiser_chip_readb(const chipaddr addr); +extern struct pcidev_status drkaiser_pcidev[]; + /* satasii.c */ int satasii_init(void); int satasii_shutdown(void); Modified: trunk/flashrom.8 =================================================================== --- trunk/flashrom.8 2009-09-02 22:09:00 UTC (rev 711) +++ trunk/flashrom.8 2009-09-02 23:00:46 UTC (rev 712) @@ -140,6 +140,8 @@ .sp .BR "* nic3com" " (for flash ROMs on 3COM network cards)" .sp +.BR "* drkaiser" " (for flash ROMs on Dr. Kaiser PC-Waechter PCI cards)" +.sp .BR "* satasii" " (for flash ROMs on Silicon Image SATA/IDE controllers)" .sp .BR "* it87spi" " (for flash ROMs behind an ITE IT87xx Super I/O LPC/SPI translation unit)" Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-09-02 22:09:00 UTC (rev 711) +++ trunk/flashrom.c 2009-09-02 23:00:46 UTC (rev 712) @@ -89,6 +89,23 @@ }, { + .name = "drkaiser", + .init = drkaiser_init, + .shutdown = drkaiser_shutdown, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .chip_readb = drkaiser_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = drkaiser_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, + .delay = internal_delay, + }, + + { .name = "satasii", .init = satasii_init, .shutdown = satasii_shutdown, @@ -747,6 +764,7 @@ printf("\nSupported PCI devices flashrom can use " "as programmer:\n\n"); print_supported_pcidevs(nics_3com); + print_supported_pcidevs(drkaiser_pcidev); print_supported_pcidevs(satas_sii); exit(0); } Modified: trunk/nic3com.c =================================================================== --- trunk/nic3com.c 2009-09-02 22:09:00 UTC (rev 711) +++ trunk/nic3com.c 2009-09-02 23:00:46 UTC (rev 712) @@ -58,7 +58,8 @@ { get_io_perms(); - io_base_addr = pcidev_init(PCI_VENDOR_ID_3COM, nics_3com, programmer_param); + io_base_addr = pcidev_init(PCI_VENDOR_ID_3COM, PCI_BASE_ADDRESS_0, + nics_3com, programmer_param); id = pcidev_dev->device_id; /* 3COM 3C90xB cards need a special fixup. */ Modified: trunk/pcidev.c =================================================================== --- trunk/pcidev.c 2009-09-02 22:09:00 UTC (rev 711) +++ trunk/pcidev.c 2009-09-02 23:00:46 UTC (rev 712) @@ -28,7 +28,7 @@ struct pci_filter filter; struct pci_dev *pcidev_dev = NULL; -uint32_t pcidev_validate(struct pci_dev *dev, struct pcidev_status *devs) +uint32_t pcidev_validate(struct pci_dev *dev, uint32_t bar, struct pcidev_status *devs) { int i; uint32_t addr; @@ -37,9 +37,9 @@ if (dev->device_id != devs[i].device_id) continue; - /* Don't use dev->base_addr[0], won't work on older libpci. */ - addr = pci_read_long(dev, PCI_BASE_ADDRESS_0) & ~0x03; - + /* Don't use dev->base_addr[x] (as value for 'bar'), won't work on older libpci. */ + addr = pci_read_long(dev, bar) & ~0x03; + printf("Found \"%s %s\" (%04x:%04x, BDF %02x:%02x.%x).\n", devs[i].vendor_name, devs[i].device_name, dev->vendor_id, dev->device_id, dev->bus, dev->dev, dev->func); @@ -57,7 +57,7 @@ return 0; } -uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs, char *pcidev_bdf) +uint32_t pcidev_init(uint16_t vendor_id, uint32_t bar, struct pcidev_status *devs, char *pcidev_bdf) { struct pci_dev *dev; char *msg = NULL; @@ -80,7 +80,7 @@ for (dev = pacc->devices; dev; dev = dev->next) { if (pci_filter_match(&filter, dev)) { - if ((addr = pcidev_validate(dev, devs)) != 0) { + if ((addr = pcidev_validate(dev, bar, devs)) != 0) { curaddr = addr; pcidev_dev = dev; found++; Modified: trunk/satasii.c =================================================================== --- trunk/satasii.c 2009-09-02 22:09:00 UTC (rev 711) +++ trunk/satasii.c 2009-09-02 23:00:46 UTC (rev 712) @@ -47,7 +47,8 @@ get_io_perms(); - pcidev_init(PCI_VENDOR_ID_SII, satas_sii, programmer_param); + pcidev_init(PCI_VENDOR_ID_SII, PCI_BASE_ADDRESS_0, satas_sii, + programmer_param); id = pcidev_dev->device_id; if ((id == 0x3132) || (id == 0x3124)) {

1 0

[PATCH] Standardize on using __func__ instead of __FUNCTION__
by Uwe Hermann 02 Sep '09

02 Sep '09

See patch. Uwe. -- http://www.hermann-uwe.de | http://www.holsham-traders.de http://www.crazy-hacks.org | http://www.unmaintained-free-software.org

2 2

[commit] r711 - trunk
by svn＠flashrom.org 02 Sep '09

02 Sep '09

Author: uwe Date: 2009-09-03 00:09:00 +0200 (Thu, 03 Sep 2009) New Revision: 711 Modified: trunk/82802ab.c trunk/am29f040b.c trunk/en29f002a.c trunk/ft2232_spi.c trunk/ichspi.c trunk/it87spi.c trunk/jedec.c trunk/m29f400bt.c trunk/mx29f002.c trunk/sharplhf00l04.c trunk/spi.c trunk/sst28sf040.c trunk/sst49lfxxxc.c trunk/stm50flw0x0x.c trunk/w29ee011.c trunk/w39v080fa.c Log: Standardize on using __func__ instead of __FUNCTION__. The __func__ variant is standardized in C99 and recommended to be used instead of __FUNCTION__ in the gcc info page. Only _very_ old versions of gcc did not know about __func__, but we've been using both __func__ and __FUNCTION__ for a long while now, and nobody complained about this, so all our users seem to use recent enough compilers. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/82802ab.c =================================================================== --- trunk/82802ab.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/82802ab.c 2009-09-02 22:09:00 UTC (rev 711) @@ -68,7 +68,7 @@ programmer_delay(10); - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2); + printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); if (id1 != flash->manufacture_id || id2 != flash->model_id) return 0; Modified: trunk/am29f040b.c =================================================================== --- trunk/am29f040b.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/am29f040b.c 2009-09-02 22:09:00 UTC (rev 711) @@ -84,7 +84,7 @@ programmer_delay(10); - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2); + printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) return 1; Modified: trunk/en29f002a.c =================================================================== --- trunk/en29f002a.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/en29f002a.c 2009-09-02 22:09:00 UTC (rev 711) @@ -47,7 +47,7 @@ chip_writeb(0x55, bios + 0x2AA); chip_writeb(0xF0, bios + 0x555); - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2); + printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) return 1; @@ -80,7 +80,7 @@ chip_writeb(0x55, bios + 0xAAA); chip_writeb(0xF0, bios + 0x555); - printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); + printf_debug("%s: id1 0x%x, id2 0x%x\n", __func__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) return 1; Modified: trunk/ft2232_spi.c =================================================================== --- trunk/ft2232_spi.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/ft2232_spi.c 2009-09-02 22:09:00 UTC (rev 711) @@ -285,7 +285,7 @@ l = total_size - i; if ((r = spi_nbyte_program(i, &buf[i], l))) { - fprintf(stderr, "%s: write fail %d\n", __FUNCTION__, r); + fprintf(stderr, "%s: write fail %d\n", __func__, r); return 1; } Modified: trunk/ichspi.c =================================================================== --- trunk/ichspi.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/ichspi.c 2009-09-02 22:09:00 UTC (rev 711) @@ -216,7 +216,7 @@ uint32_t opmenu[2]; if (op == NULL) { - printf_debug("\n%s: null OPCODES pointer!\n", __FUNCTION__); + printf_debug("\n%s: null OPCODES pointer!\n", __func__); return -1; } @@ -235,7 +235,7 @@ opmenu[1] = REGREAD32(ICH9_REG_OPMENU + 4); break; default: - printf_debug("%s: unsupported chipset\n", __FUNCTION__); + printf_debug("%s: unsupported chipset\n", __func__); return -1; } @@ -317,7 +317,7 @@ REGWRITE32(ICH9_REG_OPMENU + 4, opmenu[1]); break; default: - printf_debug("%s: unsupported chipset\n", __FUNCTION__); + printf_debug("%s: unsupported chipset\n", __func__); return -1; } @@ -610,7 +610,7 @@ return SPI_INVALID_LENGTH; return ich9_run_opcode(op, offset, datalength, data); default: - printf_debug("%s: unsupported chipset\n", __FUNCTION__); + printf_debug("%s: unsupported chipset\n", __func__); } /* If we ever get here, something really weird happened */ Modified: trunk/it87spi.c =================================================================== --- trunk/it87spi.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/it87spi.c 2009-09-02 22:09:00 UTC (rev 711) @@ -168,7 +168,7 @@ } while (busy); if (readcnt > 3) { printf("%s called with unsupported readcnt %i.\n", - __FUNCTION__, readcnt); + __func__, readcnt); return SPI_INVALID_LENGTH; } switch (writecnt) { @@ -198,7 +198,7 @@ break; default: printf("%s called with unsupported writecnt %i.\n", - __FUNCTION__, writecnt); + __func__, writecnt); return SPI_INVALID_LENGTH; } /* Modified: trunk/jedec.c =================================================================== --- trunk/jedec.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/jedec.c 2009-09-02 22:09:00 UTC (rev 711) @@ -145,7 +145,7 @@ chip_writeb(0xF0, bios + 0x5555); programmer_delay(probe_timing_exit); - printf_debug("%s: id1 0x%02x, id2 0x%02x", __FUNCTION__, largeid1, largeid2); + printf_debug("%s: id1 0x%02x, id2 0x%02x", __func__, largeid1, largeid2); if (!oddparity(id1)) printf_debug(", id1 parity violation"); Modified: trunk/m29f400bt.c =================================================================== --- trunk/m29f400bt.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/m29f400bt.c 2009-09-02 22:09:00 UTC (rev 711) @@ -75,7 +75,7 @@ programmer_delay(10); - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2); + printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) return 1; Modified: trunk/mx29f002.c =================================================================== --- trunk/mx29f002.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/mx29f002.c 2009-09-02 22:09:00 UTC (rev 711) @@ -36,7 +36,7 @@ programmer_delay(10); - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2); + printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) return 1; Modified: trunk/sharplhf00l04.c =================================================================== --- trunk/sharplhf00l04.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/sharplhf00l04.c 2009-09-02 22:09:00 UTC (rev 711) @@ -60,7 +60,7 @@ programmer_delay(10); - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2); + printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); if (id1 != flash->manufacture_id || id2 != flash->model_id) return 0; Modified: trunk/spi.c =================================================================== --- trunk/spi.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/spi.c 2009-09-02 22:09:00 UTC (rev 711) @@ -264,7 +264,7 @@ id2 = (readarr[1] << 8) | readarr[2]; } - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2); + printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) { /* Print the status register to tell the @@ -321,7 +321,7 @@ id1 = readarr[0]; id2 = readarr[1]; - printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); + printf_debug("%s: id1 0x%x, id2 0x%x\n", __func__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) { /* Print the status register to tell the @@ -356,7 +356,7 @@ return 0; id2 = readarr[0]; - printf_debug("%s: id 0x%x\n", __FUNCTION__, id2); + printf_debug("%s: id 0x%x\n", __func__, id2); if (id2 != flash->model_id) return 0; Modified: trunk/sst28sf040.c =================================================================== --- trunk/sst28sf040.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/sst28sf040.c 2009-09-02 22:09:00 UTC (rev 711) @@ -111,7 +111,7 @@ chip_writeb(RESET, bios); programmer_delay(10); - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2); + printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) return 1; Modified: trunk/sst49lfxxxc.c =================================================================== --- trunk/sst49lfxxxc.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/sst49lfxxxc.c 2009-09-02 22:09:00 UTC (rev 711) @@ -141,7 +141,7 @@ chip_writeb(RESET, bios); - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2); + printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); if (!(id1 == flash->manufacture_id && id2 == flash->model_id)) return 0; Modified: trunk/stm50flw0x0x.c =================================================================== --- trunk/stm50flw0x0x.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/stm50flw0x0x.c 2009-09-02 22:09:00 UTC (rev 711) @@ -80,7 +80,7 @@ chip_writeb(0xF0, bios + 0x5555); programmer_delay(40); - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, largeid1, + printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, largeid1, largeid2); if (largeid1 != flash->manufacture_id || largeid2 != flash->model_id) Modified: trunk/w29ee011.c =================================================================== --- trunk/w29ee011.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/w29ee011.c 2009-09-02 22:09:00 UTC (rev 711) @@ -61,7 +61,7 @@ chip_writeb(0xF0, bios + 0x5555); programmer_delay(10); - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, id1, id2); + printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, id1, id2); if (id1 == flash->manufacture_id && id2 == flash->model_id) return 1; Modified: trunk/w39v080fa.c =================================================================== --- trunk/w39v080fa.c 2009-09-02 13:53:56 UTC (rev 710) +++ trunk/w39v080fa.c 2009-09-02 22:09:00 UTC (rev 711) @@ -41,7 +41,7 @@ chip_writeb(0xF0, bios + 0x5555); programmer_delay(10); - printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); + printf_debug("%s: id1 0x%x, id2 0x%x\n", __func__, id1, id2); if (id1 != flash->manufacture_id || id2 != flash->model_id) return 0;

1 0

Flashrom write on a Gigabyte GA-MA770-UD3 motherboard
by Davíð Þór Þórarinsson 02 Sep '09

02 Sep '09

Hello there good people, I assebled a new computer the other day and I just successfully updated the BIOS on the motherboard using the flashrom utility found in the latest development build of Kubuntu (version 9.10). The kernel version being used is 2.6.31 (which is still an RC at this stage) Some interesting facts: The chipset in this product is not on your list of supported chipsets, nor is the motherboard found on your list of supported motherboards. the chipset according to the manual is North Bridge: AMD770, South Bridge: AMD SB710. As this motherboard supports dual bios (that supposedly reverts back to the old if the flash write didn't work) then I decided to go ahead and try flashrom out to see if it could help me out. And it worked like a charm! During the flash update, both the motherboard and chipset were wrongly identified. Here is the output from the operation: flashrom v0.9.0-r631 No coreboot table found Found Chipset "AMD SB700", enabling flash write... OK Found board "GIGABYTE GA-MA78GM-S2H", enabling flash write... FAILED! Calibrating delay loop... OK. Found chip "Macronix MX25L8005" (1024 KB) at physical address 0xFFF00000. Flash image seems to be a legacy BIOS. Disabling checks. Writing flash chip... Erasing flash before programming... done. Programming flash................. done. COMPLETE. Verifying flash... VERIFIED. Anyway, your site said to get in touch with results (good or bad) so here I am. I would also like to thank you for this utility and to let you know that if I can supply you with more information about this system if needed. Best regards, /David

3 4

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom