From 7e0dad03507670a905b7a4f0aab70770d8c157ab Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Sat, 14 Nov 2009 03:48:33 +0000 Subject: The automatic retry in write_page_write_jedec didn't retry flashing the correct range, essentially rendering the functionality useless This patch simplifies the code and fixes the bug. Thanks to Luke Dashjr for testing. Mark Winbond W29C040P as supported. Corresponding to flashrom svn r757. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Luke Dashjr --- jedec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'jedec.c') diff --git a/jedec.c b/jedec.c index fb6e5ed..69a59b3 100644 --- a/jedec.c +++ b/jedec.c @@ -262,7 +262,7 @@ int erase_chip_jedec(struct flashchip *flash) int write_page_write_jedec(struct flashchip *flash, uint8_t *src, int start, int page_size) { - int i, tried = 0, start_index = 0, ok; + int i, tried = 0, ok; uint8_t *s = src; chipaddr bios = flash->virtual_memory; chipaddr dst = bios + start; @@ -275,7 +275,7 @@ retry: chip_writeb(0xA0, bios + 0x5555); /* transfer data from source to destination */ - for (i = start_index; i < page_size; i++) { + for (i = 0; i < page_size; i++) { /* If the data is 0xFF, don't program it */ if (*src != 0xFF) chip_writeb(*src, dst); @@ -290,7 +290,7 @@ retry: ok = !verify_range(flash, src, start, page_size, NULL); if (!ok && tried++ < MAX_REFLASH_TRIES) { - start_index = i; + fprintf(stderr, "retrying.\n"); goto retry; } if (!ok) { -- cgit v1.1