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

flashrom: Handle NULL probe, erase and write function pointers in the 

flashchips table. The read pointer was already checked properly.

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


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3273 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Peter Stuge 2008-04-28 14:47:30 +00:00
parent e2271430c5
commit 26e08b5abe
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
util/flashrom/flashrom.c
View File

@ -111,6 +111,11 @@ struct flashchip *probe_flash(struct flashchip *flash)
} }
printf_debug("Probing for %s %s, %d KB: ", printf_debug("Probing for %s %s, %d KB: ",
flash->vendor, flash->name, flash->total_size); flash->vendor, flash->name, flash->total_size);
if (!flash->probe) {
printf_debug("failed! flashrom has no probe function for this flash chip.\n");
flash++;
continue;
}
size = flash->total_size * 1024; size = flash->total_size * 1024;
@ -425,6 +430,10 @@ int main(int argc, char *argv[])
if (erase_it) { if (erase_it) {
printf("Erasing flash chip\n"); printf("Erasing flash chip\n");
if (!flash->erase) {
fprintf(stderr, "Error: flashrom has no erase function for this flash chip.\n");
return 1;
}
flash->erase(flash); flash->erase(flash);
exit(0); exit(0);
} else if (read_it) { } else if (read_it) {
@ -493,8 +502,13 @@ int main(int argc, char *argv[])
// //////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////
if (write_it) if (write_it) {
if (!flash->write) {
fprintf(stderr, "Error: flashrom has no write function for this flash chip.\n");
return 1;
}
ret |= flash->write(flash, buf); ret |= flash->write(flash, buf);
}
if (verify_it) if (verify_it)
ret |= verify_flash(flash, buf); ret |= verify_flash(flash, buf);