Unify chip write functions
The currently used write functions (wrappers) all use helpers which
perform the actual write (inner functions).
The signature of the write wrappers is: int write_chip(struct flashchip
*flash, uint8_t * buf);
The signature of the inner write functions varied a lot. This patch
changes them to: int write_part(struct flashchip *flash, uint8_t *src,
int start, int len);
Did you know that flashrom has only 8 inner write functions for all
flash chips? write_page_write_jedec_common write_sector_jedec_common
write_sector_28sf040 spi_chip_write_256_new spi_chip_write_1_new
spi_aai_write_new write_page_82802ab write_page_m29f400bt
Export all inner write functions.
Change the function signature of wait_82802ab to eliminate single-use
variables.
Remove an error message in write_page_m29f400bt which was printed for
every byte written regardless of success.
Add sharplhf00l04.c to the list of flash chip drivers in the Makefile.
While the functions in there are unused, I suspect we will need them
later, and by hooking the file up we ensure that compilation won't
break.
Corresponding to flashrom svn r1208.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
diff --git a/m29f400bt.c b/m29f400bt.c
index 3c00306..98e0762 100644
--- a/m29f400bt.c
+++ b/m29f400bt.c
@@ -27,12 +27,13 @@
0x555 instead of 0x2AA. Do *not* blindly replace with standard JEDEC
functions. */
-void write_page_m29f400bt(chipaddr bios, uint8_t *src,
- chipaddr dst, int page_size)
+int write_page_m29f400bt(struct flashchip *flash, uint8_t *src, int start, int len)
{
int i;
+ chipaddr bios = flash->virtual_memory;
+ chipaddr dst = flash->virtual_memory + start;
- for (i = 0; i < page_size; i++) {
+ for (i = 0; i < len; i++) {
chip_writeb(0xAA, bios + 0xAAA);
chip_writeb(0x55, bios + 0x555);
chip_writeb(0xA0, bios + 0xAAA);
@@ -40,11 +41,17 @@
/* transfer data from source to destination */
chip_writeb(*src, dst);
toggle_ready_jedec(dst);
+#if 0
+ /* We only want to print something in the error case. */
msg_cerr("Value in the flash at address 0x%lx = %#x, want %#x\n",
(dst - bios), chip_readb(dst), *src);
+#endif
dst++;
src++;
}
+
+ /* FIXME: Ignore errors for now. */
+ return 0;
}
int probe_m29f400bt(struct flashchip *flash)
@@ -138,20 +145,15 @@
int i;
int total_size = flash->total_size * 1024;
int page_size = flash->page_size;
- chipaddr bios = flash->virtual_memory;
for (i = 0; i < (total_size / page_size) - 1; i++) {
- write_page_m29f400bt(bios, buf + i * page_size,
- bios + i * page_size, page_size);
+ write_page_m29f400bt(flash, buf + i * page_size, i * page_size, page_size);
}
- write_page_m29f400bt(bios, buf + 0x70000, bios + 0x70000, 32 * 1024);
-
- write_page_m29f400bt(bios, buf + 0x78000, bios + 0x78000, 8 * 1024);
-
- write_page_m29f400bt(bios, buf + 0x7a000, bios + 0x7a000, 8 * 1024);
-
- write_page_m29f400bt(bios, buf + 0x7c000, bios + 0x7c000, 16 * 1024);
+ write_page_m29f400bt(flash, buf + 0x70000, 0x70000, 32 * 1024);
+ write_page_m29f400bt(flash, buf + 0x78000, 0x78000, 8 * 1024);
+ write_page_m29f400bt(flash, buf + 0x7a000, 0x7a000, 8 * 1024);
+ write_page_m29f400bt(flash, buf + 0x7c000, 0x7c000, 16 * 1024);
return 0;
}