GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flashrom: Only find "unknown .. SPI chip" if no other chip was found 

This removes the false positive matches we've been seeing, and also removes
the true positive match in case there is more than one flash chip and the 2nd
or 3rd are unknown - but I think that case is uncommon enough to warrant the
improvement in the common case. Use flashrom -frc forced read if you have the
uncommon case, and/or please add the flash chip to the flashchips array.

Signed-off-by: Peter Stuge <peter@stuge.se>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3562 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Peter Stuge 2008-09-03 23:10:05 +00:00
parent d57a680632
commit 12aa5d9acf
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util/flashrom/flashrom.c
View File

@ -99,12 +99,13 @@ int map_flash_registers(struct flashchip *flash)
return 0; return 0;
} }
struct flashchip *probe_flash(struct flashchip *flash, int force) struct flashchip *probe_flash(struct flashchip *first_flash, int force)
{ {
volatile uint8_t *bios; volatile uint8_t *bios;
struct flashchip *flash;
unsigned long flash_baseaddr = 0, size; unsigned long flash_baseaddr = 0, size;
for (; flash && flash->name; flash++) { for (flash = first_flash; flash && flash->name; flash++) {
if (chip_to_probe && strcmp(flash->name, chip_to_probe) != 0) if (chip_to_probe && strcmp(flash->name, chip_to_probe) != 0)
continue; continue;
printf_debug("Probing for %s %s, %d KB: ", printf_debug("Probing for %s %s, %d KB: ",
@ -150,9 +151,13 @@ struct flashchip *probe_flash(struct flashchip *flash, int force)
if (force) if (force)
break; break;
if (flash->probe(flash) == 1) if (flash->probe(flash) != 1)
goto notfound;
if (first_flash == flashchips || flash->model_id != GENERIC_DEVICE_ID)
break; break;
notfound:
munmap((void *)bios, size); munmap((void *)bios, size);
} }