flashrom May 2010

flashrom@flashrom.org

64 participants
169 discussions

[commit] r1011 - trunk
by repository service 24 May '10

24 May '10

Author: uwe Date: Mon May 24 19:39:14 2010 New Revision: 1011 URL: http://flashrom.org/trac/coreboot/changeset/1011 Log: Various nicrealtek fixes: - Add missing entries for 'flashrom -L' output and wiki output. - Add missing entries in the manpage. - nicrealtek.c: Coding style fixes and cosmetics. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/flashrom.8 trunk/nicrealtek.c trunk/print.c trunk/print_wiki.c Modified: trunk/flashrom.8 ============================================================================== --- trunk/flashrom.8 Mon May 24 18:03:57 2010 (r1010) +++ trunk/flashrom.8 Mon May 24 19:39:14 2010 (r1011) @@ -152,6 +152,10 @@ .sp .BR "* nic3com" " (for flash ROMs on 3COM network cards)" .sp +.BR "* nicrealtek" " (for flash ROMs on Realtek network cards)" +.sp +.BR "* nicsmc1211" " (for flash ROMs on RTL8139-compatible SMC2 network cards)" +.sp .BR "* gfxnvidia" " (for flash ROMs on NVIDIA graphics cards)" .sp .BR "* drkaiser" " (for flash ROMs on Dr. Kaiser PC-Waechter PCI cards)" @@ -276,7 +280,7 @@ Example: .B "flashrom -p dummy:lpc,fwh" .TP -.BR "nic3com" , " gfxnvidia" , " satasii " and " atahpt " programmers +.BR "nic3com" , " nicrealtek" , " nicsmc1211" , " gfxnvidia" , " satasii " and " atahpt " programmers These programmers have an option to specify the PCI address of the card your want to use, which must be specified if more than one card supported by the selected programmer is installed in your system. The syntax is Modified: trunk/nicrealtek.c ============================================================================== --- trunk/nicrealtek.c Mon May 24 18:03:57 2010 (r1010) +++ trunk/nicrealtek.c Mon May 24 19:39:14 2010 (r1011) @@ -30,34 +30,34 @@ #define BIOS_ROM_DATA 0xD7 struct pcidev_status nics_realtek[] = { - {0x10ec, 0x8139, OK, "Realtek","rtl8139b/c PCI 10/100 Mbps"}, + {0x10ec, 0x8139, OK, "Realtek", "RTL8139/8139C/8139C+"}, {}, }; struct pcidev_status nics_realteksmc1211[] = { - {0x1113, 0x1211, OK, "SMC", "SMC 1211TX rtl8139 clone 10/100 Mbps"}, - {} + {0x1113, 0x1211, OK, "SMC2", "1211TX"}, /* RTL8139 clone */ + {}, }; - int nicrealtek_init(void) { get_io_perms(); + io_base_addr = pcidev_init(PCI_VENDOR_ID_REALTEK, PCI_BASE_ADDRESS_0, - nics_realtek, programmer_param); - + nics_realtek, programmer_param); + buses_supported = CHIP_BUSTYPE_PARALLEL; return 0; } - int nicsmc1211_init(void) { get_io_perms(); + io_base_addr = pcidev_init(PCI_VENDOR_ID_SMC1211, PCI_BASE_ADDRESS_0, - nics_realteksmc1211, programmer_param); - + nics_realteksmc1211, programmer_param); + buses_supported = CHIP_BUSTYPE_PARALLEL; return 0; @@ -73,17 +73,23 @@ void nicrealtek_chip_writeb(uint8_t val, chipaddr addr) { - OUTL(((uint32_t)addr &0x01FFFF)|0x0A0000| (val << 24), io_base_addr + BIOS_ROM_ADDR); - OUTL(((uint32_t)addr &0x01FFFF)|0x1E0000| (val << 24), io_base_addr + BIOS_ROM_ADDR); + OUTL(((uint32_t)addr & 0x01FFFF) | 0x0A0000 | (val << 24), + io_base_addr + BIOS_ROM_ADDR); + OUTL(((uint32_t)addr & 0x01FFFF) | 0x1E0000 | (val << 24), + io_base_addr + BIOS_ROM_ADDR); } uint8_t nicrealtek_chip_readb(const chipaddr addr) - { - uint8_t val=INB(io_base_addr + BIOS_ROM_DATA); - OUTL(((uint32_t)addr & 0x01FFFF) | 0x060000 | (val << 24), io_base_addr + BIOS_ROM_ADDR); - val=INB(io_base_addr + BIOS_ROM_DATA); - OUTL(((uint32_t)addr & 0x01FFFF) | 0x1E0000 | (val << 24), io_base_addr + BIOS_ROM_ADDR); - return val ; + uint8_t val; + + val = INB(io_base_addr + BIOS_ROM_DATA); + OUTL(((uint32_t)addr & 0x01FFFF) | 0x060000 | (val << 24), + io_base_addr + BIOS_ROM_ADDR); + + val = INB(io_base_addr + BIOS_ROM_DATA); + OUTL(((uint32_t)addr & 0x01FFFF) | 0x1E0000 | (val << 24), + io_base_addr + BIOS_ROM_ADDR); + return val; } Modified: trunk/print.c ============================================================================== --- trunk/print.c Mon May 24 18:03:57 2010 (r1010) +++ trunk/print.c Mon May 24 19:39:14 2010 (r1011) @@ -238,6 +238,10 @@ #if NIC3COM_SUPPORT == 1 print_supported_pcidevs(nics_3com); #endif +#if NICREALTEK_SUPPORT == 1 + print_supported_pcidevs(nics_realtek); + print_supported_pcidevs(nics_realteksmc1211); +#endif #if GFXNVIDIA_SUPPORT == 1 print_supported_pcidevs(gfx_nvidia); #endif Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Mon May 24 18:03:57 2010 (r1010) +++ trunk/print_wiki.c Mon May 24 19:39:14 2010 (r1011) @@ -592,6 +592,10 @@ #if NIC3COM_SUPPORT == 1 print_supported_pcidevs_wiki(nics_3com); #endif +#if NICREALTEK_SUPPORT == 1 + print_supported_pcidevs_wiki(nics_realtek); + print_supported_pcidevs_wiki(nics_realteksmc1211); +#endif #if GFXNVIDIA_SUPPORT == 1 print_supported_pcidevs_wiki(gfx_nvidia); #endif

1 0

Nokia IP530 lspci for flashrom
by mbertens 24 May '10

24 May '10

On request, but now the the file, sorry for that Marc

1 1

[commit] r1010 - trunk
by repository service 24 May '10

24 May '10

Author: mkarcher Date: Mon May 24 18:03:57 2010 New Revision: 1010 URL: http://flashrom.org/trac/coreboot/changeset/1010 Log: Board enable for IP530 Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Marc Bertens <mbertens(a)xs4all.nl> Modified: trunk/board_enable.c Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Mon May 24 17:28:12 2010 (r1009) +++ trunk/board_enable.c Mon May 24 18:03:57 2010 (r1010) @@ -96,6 +96,48 @@ #endif /** + * SMSC FDC37B787: Raise GPIO50 + */ + +static int fdc37b787_gpio50_raise(uint16_t port, const char * name) +{ + uint8_t id, val; + + OUTB(0x55, port); /* enter conf mode */ + id = sio_read(port, 0x20); + if (id != 0x44) { + fprintf(stderr, "\nERROR: %s: FDC37B787: Wrong ID 0x%02X.\n", + name, id); + OUTB(0xAA, port); /* leave conf mode */ + return -1; + } + + sio_write(port, 0x07, 0x08); /* Select Aux I/O subdevice */ + + val = sio_read(port, 0xC8); /* GP50 */ + if ((val & 0x1B) != 0x10) /* output, no invert, GPIO */ + { + fprintf(stderr, "\nERROR: %s: GPIO50 mode 0x%02X unexpected.\n", + name, val); + OUTB(0xAA, port); + return -1; + } + + sio_mask(port, 0xF9, 0x01, 0x01); + + OUTB(0xAA, port); /* Leave conf mode */ + return 0; +} + +/** + * Suited for Nokia IP530: Intel 440BX + PIIX4 + FDC37B787 + */ +static int fdc37b787_gpio50_raise_3f0(const char *name) +{ + return fdc37b787_gpio50_raise(0x3f0, name); +} + +/** * Winbond W83627HF: Raise GPIO24. * * Suited for: @@ -1406,6 +1448,7 @@ {0x10DE, 0x005E, 0x1462, 0x7135, 0x10DE, 0x0050, 0x1462, 0x7135, NULL, "msi", "k8n-neo3", "MSI", "MS-7135 (K8N Neo3)", 0, OK, w83627thf_gpio4_4_raise_4e}, {0x10DE, 0x0270, 0x1462, 0x7207, 0x10DE, 0x0264, 0x1462, 0x7207, NULL, NULL, NULL, "MSI", "MS-7207 (K8N GM2-L)", 0, NT, nvidia_mcp_gpio2_raise}, {0x10DE, 0x005E, 0x1462, 0x7125, 0x10DE, 0x0052, 0x1462, 0x7125, NULL, NULL, NULL, "MSI", "K8N Neo4-F", 0, OK, nvidia_mcp_gpio2_raise}, + {0x1011, 0x0019, 0xaa55, 0xaa55, 0x8086, 0x7190, 0, 0, NULL, NULL, NULL, "Nokia", "IP530", 0, OK, fdc37b787_gpio50_raise_3f0}, {0x1106, 0x3099, 0, 0, 0x1106, 0x3074, 0, 0, NULL, "shuttle", "ak31", "Shuttle", "AK31", 0, OK, w836xx_memw_enable_2e}, {0x1106, 0x3104, 0x1297, 0xa238, 0x1106, 0x3059, 0x1297, 0xc063, NULL, NULL, NULL, "Shuttle", "AK38N", 256, OK, it8705f_write_enable_2e}, {0x10DE, 0x0050, 0x1297, 0x5036, 0x1412, 0x1724, 0x1297, 0x5036, NULL, NULL, NULL, "Shuttle", "FN25", 0, OK, board_shuttle_fn25},

1 0

[commit] r1009 - trunk
by repository service 24 May '10

24 May '10

Author: uwe Date: Mon May 24 17:28:12 2010 New Revision: 1009 URL: http://flashrom.org/trac/coreboot/changeset/1009 Log: Various wiki output improvements as per IRC discussion (trivial). - Use '?3' wiki template (light greenish, not gray) for untested stuff. - Reduce page width a bit to improve readability on smaller screens. - Generalize some functions a bit (pass in how many columns to generate). - Mark untested board-enables as such (were incorrectly marked "OK" so far). - Drop some useless 'valign=top' entries. - Make a few more functions 'static' while we're at it. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/print_wiki.c Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Sat May 22 09:31:50 2010 (r1008) +++ trunk/print_wiki.c Mon May 24 17:28:12 2010 (r1009) @@ -371,7 +371,7 @@ return -1; } -void print_supported_chipsets_wiki(void) +static void print_supported_chipsets_wiki(int cols) { int i, j, enablescount = 0, color = 1; const struct penable *e; @@ -389,14 +389,14 @@ if (i > 0 && strcmp(e[i].vendor_name, e[i - 1].vendor_name)) color = !color; - printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s " + printf("|- bgcolor=\"#%s\"\n| %s || %s " "|| %04x:%04x || %s\n", (color) ? "eeeeee" : "dddddd", e[i].vendor_name, e[i].device_name, e[i].vendor_id, e[i].device_id, - (e[i].status == OK) ? "{{OK}}" : "?"); + (e[i].status == OK) ? "{{OK}}" : "{{?3}}"); - /* Split table in three columns. */ - if (j >= (enablescount / 3 + 1)) { + /* Split table in 'cols' columns. */ + if (j >= (enablescount / cols + 1)) { printf("\n|}\n\n| valign=\"top\"|\n\n%s", chipset_th); j = 0; } @@ -429,7 +429,7 @@ k = url(b[i].vendor, b[i].name); c = note(b[i].vendor, b[i].name); - printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s%s %s%s ||" + printf("|- bgcolor=\"#%s\"\n| %s || %s%s %s%s ||" " {{%s}}", (color) ? "eeeeee" : "dddddd", b[i].vendor, (k != -1 && u[k].url) ? "[" : "", (k != -1 && u[k].url) ? u[k].url : "", @@ -479,17 +479,18 @@ k = url(b[i].vendor_name, b[i].board_name); - printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s%s %s%s " - "|| %s%s%s%s || {{OK}}\n", (color) ? "eeeeee" : "dddddd", + printf("|- bgcolor=\"#%s\"\n| %s || %s%s %s%s " + "|| %s%s%s%s || {{%s}}\n", (color) ? "eeeeee" : "dddddd", b[i].vendor_name, (k != -1 && u[k].url) ? "[" : "", (k != -1 && u[k].url) ? u[k].url : "", b[i].board_name, (k != -1 && u[k].url) ? "]" : "", (b[i].lb_vendor) ? "-m " : "—", (b[i].lb_vendor) ? b[i].lb_vendor : "", (b[i].lb_vendor) ? ":" : "", - (b[i].lb_vendor) ? b[i].lb_part : ""); + (b[i].lb_vendor) ? b[i].lb_part : "", + (b[i].status == OK) ? "OK" : "?3"); - /* Split table in three columns. */ + /* Split table in 'cols' columns. */ if (j >= (boardcount / cols + 1)) { printf("\n|}\n\n| valign=\"top\"|\n\n%s", board_th2); j = 0; @@ -499,11 +500,11 @@ printf("\n|}\n\n|}\n"); } -void print_supported_boards_wiki(void) +static void print_supported_boards_wiki(void) { printf("%s", board_intro); wiki_helper("Known good (worked out of the box)", "OK", 3, boards_ok); - wiki_helper2("Known good (with write-enable code in flashrom)", 3); + wiki_helper2("Known good (with write-enable code in flashrom)", 2); wiki_helper("Not supported (yet)", "No", 3, boards_bad); printf("%s", laptop_intro); @@ -512,7 +513,7 @@ } #endif -void print_supported_chips_wiki(void) +static void print_supported_chips_wiki(int cols) { int i = 0, c = 1, chipcount = 0; struct flashchip *f, *old = NULL; @@ -535,21 +536,21 @@ c = !c; t = f->tested; - printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s || %d " + printf("|- bgcolor=\"#%s\"\n| %s || %s || %d " "|| %s || {{%s}} || {{%s}} || {{%s}} || {{%s}}\n", (c == 1) ? "eeeeee" : "dddddd", f->vendor, f->name, f->total_size, flashbuses_to_text(f->bustype), (t & TEST_OK_PROBE) ? "OK" : - (t & TEST_BAD_PROBE) ? "No" : ((c) ? "?2" : "?"), + (t & TEST_BAD_PROBE) ? "No" : "?3", (t & TEST_OK_READ) ? "OK" : - (t & TEST_BAD_READ) ? "No" : ((c) ? "?2" : "?"), + (t & TEST_BAD_READ) ? "No" : "?3", (t & TEST_OK_ERASE) ? "OK" : - (t & TEST_BAD_ERASE) ? "No" : ((c) ? "?2" : "?"), + (t & TEST_BAD_ERASE) ? "No" : "?3", (t & TEST_OK_WRITE) ? "OK" : - (t & TEST_BAD_WRITE) ? "No" : ((c) ? "?2" : "?")); + (t & TEST_BAD_WRITE) ? "No" : "?3"); - /* Split table into three columns. */ - if (i >= (chipcount / 3 + 1)) { + /* Split table into 'cols' columns. */ + if (i >= (chipcount / cols + 1)) { printf("\n|}\n\n| valign=\"top\"|\n\n%s", chip_th); i = 0; } @@ -560,7 +561,7 @@ printf("\n|}\n\n|}\n"); } -void print_supported_pcidevs_wiki(struct pcidev_status *devs) +static void print_supported_pcidevs_wiki(struct pcidev_status *devs) { int i = 0; static int c = 0; @@ -569,11 +570,11 @@ c = !c; for (i = 0; devs[i].vendor_name != NULL; i++) { - printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s || " + printf("|- bgcolor=\"#%s\"\n| %s || %s || " "%04x:%04x || {{%s}}\n", (c) ? "eeeeee" : "dddddd", devs[i].vendor_name, devs[i].device_name, devs[i].vendor_id, devs[i].device_id, - (devs[i].status == NT) ? (c) ? "?2" : "?" : "OK"); + (devs[i].status == NT) ? "?3" : "OK"); } } @@ -583,8 +584,8 @@ printf(wiki_header, ctime(&t), flashrom_version); #if INTERNAL_SUPPORT == 1 - print_supported_chips_wiki(); - print_supported_chipsets_wiki(); + print_supported_chips_wiki(2); + print_supported_chipsets_wiki(3); print_supported_boards_wiki(); #endif printf("%s", programmer_section);

1 0

Nokia IP530 lspci for flashrom
by mbertens 24 May '10

24 May '10

On request Marc

1 0

new version flashrom with Nokia IP530
by mbertens 24 May '10

24 May '10

hi all, i checked out the new version of flashrom, but it seems it was missing the patches that where done for the Nokia IP530 Marc

1 0

flash not found on Gigabyte GA-K8VM800M
by Guenter 24 May '10

24 May '10

Hi, just came over a Gigabyte MB GA-K8VM800M, and flash chip was not found; attached verbose output. Gün.

1 0

DOS version of flashrom
by Andrew Goodbody 23 May '10

23 May '10

Hi, I tried to build flashrom for DOS on Ubuntu 10.04 following the instructions in the flashrom README. There are quite a few issues with missing steps and stuff that simply does not work. I finally gave up when it could not resolve _valloc. I would very much like to know the rest of the instructions for a successful cross compile to DOS. I saw that Carl-Daniel Hailfinger has offered to proved a tar ball of the cross compiler etc but it would be really good to be able to fix the instructions in the README. Then I found the flashrom mailing list archive with a reference to a prebuilt version on Rudolf Marek's site - thanks. I have now run this and apart from not being able to find 'dmidecode' it managed to correctly identify the SPI device (a W25x32) on the system behind an ICH9M-E which is in descriptor mode but not locked down. Andrew

2 8

Re: [flashrom] spi_block_erase_d8 failed during command execution
by Michael Karcher 23 May '10

23 May '10

Am Sonntag, den 23.05.2010, 11:31 +0200 schrieb Dominic Fandrey: > I suspect I just bricked my notebook. I tried to flash it with a > BIOS image I exchanged some device IDs in. It failed with the subject > error and I tried to flash again with the backup, which failed in > the same manner (needless to say I dare not reboot at the moment). > > Attached are the error output and the dmidecode output. I can also > supply the BIOS images to you. [attachment edited to remove repetitive part] > Kind regards, > Dominic Fandrey

2 2

[PATCH] Make satasii driver more robust
by Carl-Daniel Hailfinger 23 May '10

23 May '10

Make the satasii driver more robust. Untested. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-satasii_robust/satasii.c =================================================================== --- flashrom-satasii_robust/satasii.c (Revision 1005) +++ flashrom-satasii_robust/satasii.c (Arbeitskopie) @@ -44,6 +44,7 @@ { uint32_t addr; uint16_t reg_offset; + uint32_t tmp; get_io_perms(); @@ -59,12 +60,19 @@ reg_offset = 0x50; } - sii_bar = physmap("SATA SIL registers", addr, 0x100) + reg_offset; + sii_bar = physmap("SATA SiI registers", addr, 0x100) + reg_offset; /* Check if ROM cycle are OK. */ if ((id != 0x0680) && (!(mmio_readl(sii_bar) & (1 << 26)))) msg_pinfo("Warning: Flash seems unconnected.\n"); + msg_pdbg("Using BAR5 access method.\n"); + tmp = pci_read_long(pcidev_dev, 0x40) & (1 << 1); + msg_pdbg("BAR5 Indirect Access is %snabled\n", tmp ? "en" : "dis"); + /* This bit has contradicting definitions in the 3512 datasheet. */ + tmp = pci_read_long(pcidev_dev, 0x88) & (1 << 16); + msg_pdbg("BAR5 Access is %snabled\n", tmp ? "en" : "dis"); + buses_supported = CHIP_BUSTYPE_PARALLEL; return 0; @@ -81,6 +89,7 @@ void satasii_chip_writeb(uint8_t val, chipaddr addr) { uint32_t ctrl_reg, data_reg; + int i = 0; while ((ctrl_reg = mmio_readl(sii_bar)) & (1 << 25)) ; @@ -92,12 +101,19 @@ mmio_writel(data_reg, (sii_bar + 4)); mmio_writel(ctrl_reg, sii_bar); - while (mmio_readl(sii_bar) & (1 << 25)) ; + while (mmio_readl(sii_bar) & (1 << 25)) { + if (++i > 10000) { + msg_perr("%s: control reg stuck at %08x, aborting\n", + __func__, mmio_readl(sii_bar)); + break; + } + } } uint8_t satasii_chip_readb(const chipaddr addr) { uint32_t ctrl_reg; + int i = 0; while ((ctrl_reg = mmio_readl(sii_bar)) & (1 << 25)) ; @@ -107,7 +123,13 @@ mmio_writel(ctrl_reg, sii_bar); - while (mmio_readl(sii_bar) & (1 << 25)) ; + while (mmio_readl(sii_bar) & (1 << 25)) { + if (++i > 10000) { + msg_perr("%s: control reg stuck at %08x, aborting\n", + __func__, mmio_readl(sii_bar)); + break; + } + } return (mmio_readl(sii_bar + 4)) & 0xff; } -- http://www.hailfinger.org/

2 1

← Newer
1
...
9
10
11
12
13
14
15
16
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom May 2010