openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-28 15:33:42 +02:00
Code Issues Releases Wiki Activity

Use read_flash() when flash chip probe is forced

Browse Source 
Corresponding to flashrom svn r563.

Signed-off-by: Stephan Guilloux <stephan.guilloux@free.fr>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
This commit is contained in:
Stephan Guilloux 2009-06-01 22:07:52 +00:00 committed by Carl-Daniel Hailfinger
parent 5a8b24478f
commit 21dd55b49e
1 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
flashrom.c
View File

@ -314,6 +314,11 @@ int read_flash(struct flashchip *flash, char *filename, unsigned int exclude_sta
FILE *image; FILE *image;
unsigned long size = flash->total_size * 1024; unsigned long size = flash->total_size * 1024;
unsigned char *buf = calloc(size, sizeof(char)); unsigned char *buf = calloc(size, sizeof(char));
if (!filename) {
printf("Error: No filename specified.\n");
return 1;
}
if ((image = fopen(filename, "w")) == NULL) { if ((image = fopen(filename, "w")) == NULL) {
perror(filename); perror(filename);
exit(1); exit(1);
@ -670,35 +675,7 @@ int main(int argc, char *argv[])
printf("Run flashrom -L to view the hardware supported in this flashrom version.\n"); printf("Run flashrom -L to view the hardware supported in this flashrom version.\n");
exit(1); exit(1);
} }
if (!filename) { return read_flash(flashes[0], filename, exclude_start_position, exclude_end_position);
printf("Error: No filename specified.\n");
exit(1);
}
size = flashes[0]->total_size * 1024;
buf = (uint8_t *) calloc(size, sizeof(char));
if ((image = fopen(filename, "w")) == NULL) {
perror(filename);
exit(1);
}
printf("Force reading flash... ");
if (!flashes[0]->read) {
printf("FAILED!\n");
fprintf(stderr, "ERROR: flashrom has no read function for this flash chip.\n");
return 1;
} else
flashes[0]->read(flashes[0], buf);
if (exclude_end_position - exclude_start_position > 0)
memset(buf + exclude_start_position, 0,
exclude_end_position -
exclude_start_position);
numbytes = fwrite(buf, 1, size, image);
fclose(image);
printf("%s.\n", numbytes == size ? "done" : "FAILED");
free(buf);
return numbytes != size;
} }
// FIXME: flash writes stay enabled! // FIXME: flash writes stay enabled!
exit(1); exit(1);