flashrom October 2010

flashrom@flashrom.org

66 participants
181 discussions

Testers/reviewers for partial writes needed
by Carl-Daniel Hailfinger 12 Oct '10

12 Oct '10

Hi, I am almost done with partial write support in flashrom, but I need tests and reviews of the new code. Already merged in flashrom are a few cleanup patches for write functions. Two patches which do the actual conversion are pending: http://patchwork.coreboot.org/patch/2091/ http://patchwork.coreboot.org/patch/2095/ Please apply them in the order specified above and review and test. Note: Even with the above patches applied, flashrom will still erase-all then write-all, but those patches are the last ones touching individual chip drivers. Once those patches are in, I will change the generic code to a rolling erase/write model with region exclusion and all the other fun stuff people want. The current code does not have progress printing for writes anymore, but this will be fixed automatically once the rolling erase/write code is in (I will simply reuse the erase progress printing). Regards, Carl-Daniel -- http://www.hailfinger.org/

1 0

Re: [flashrom] DOS binary doesn't work?
by max 12 Oct '10

12 Oct '10

--- On Sun, 10/10/10, max <opendtv(a)yahoo.com> wrote: > Anyone want to speculate why flashram can set the BIOS > write enable bit under Linux but not DOS? Is Linux taking > over SMI somehow, or is there some BIOS call which permits > BIOS writing? Something else? Some more info: tried two flavors of linux CDs with flashrom, SystemRescueCD: works GRML: can't enable writing (same as DOS) Thinking it must have something to do with ACPI, I tried disabling ACPI with SystemRescueCD (tried acpi=off, acpi-off, and noacpi), but it still worked. However, I don't know how to verify that ACPI support was really disabled. By the way, the master SMI enable can't be disabled; the BIOS locks it. Unless there is a way to generate a PCI reset without rebooting the system... Thanks, Dan

2 2

Re: [flashrom] DOS binary doesn't work?
by max 11 Oct '10

11 Oct '10

--- On Sat, 10/9/10, max <opendtv(a)yahoo.com> wrote: > Does flashrom-DOS disable SMI? If not, then the BIOS is > probably resetting the bit. > > (Under Linux the BIOS write enable bit is already set). Correction, the enable bit is not already set under Linux (I ran flashrom twice and the bit was set the first time by flashrom). Anyone want to speculate why flashram can set the BIOS write enable bit under Linux but not DOS? Is Linux taking over SMI somehow, or is there some BIOS call which permits BIOS writing? Something else? Thanks, Dan

2 1

[PATCH] Simplify calls to inner write functions
by Carl-Daniel Hailfinger 10 Oct '10

10 Oct '10

Simplify calls to inner write functions. No behavioural changes, just equivalence transformations. Depends on Re: [flashrom] [PATCH] Use common function signature for inner write functions Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> --- flashrom-partial_write_inner_function_signature/82802ab.c 2010-10-09 02:26:24.000000000 +0200 +++ flashrom-partial_write_inner_function_signature_simplify_calls/82802ab.c 2010-10-09 02:16:44.000000000 +0200 @@ -162,13 +162,7 @@ int write_82802ab(struct flashchip *flash, uint8_t *buf) { - int i; - - for (i = 0; i < flash->total_size; i++) { - write_page_82802ab(flash, buf + i * 1024, i * 1024, 1024); - } - - return 0; + return write_page_82802ab(flash, buf, 0, flash->total_size * 1024); } int unlock_28f004s5(struct flashchip *flash) --- flashrom-partial_write_inner_function_signature/jedec.c 2010-10-09 02:26:24.000000000 +0200 +++ flashrom-partial_write_inner_function_signature_simplify_calls/jedec.c 2010-10-09 01:54:26.000000000 +0200 @@ -411,16 +411,11 @@ int write_jedec_1(struct flashchip *flash, uint8_t * buf) { - int i; int mask; mask = getaddrmask(flash); - for (i = 0; i < flash->total_size; i++) { - write_sector_jedec_common(flash, buf + i * 1024, i * 1024, 1024, mask); - } - - return 0; + return write_sector_jedec_common(flash, buf, 0, flash->total_size * 1024, mask); } /* erase chip with block_erase() prototype */ --- flashrom-partial_write_inner_function_signature/m29f400bt.c 2010-10-09 02:26:24.000000000 +0200 +++ flashrom-partial_write_inner_function_signature_simplify_calls/m29f400bt.c 2010-10-09 02:15:53.000000000 +0200 @@ -142,18 +142,5 @@ int write_m29f400bt(struct flashchip *flash, uint8_t *buf) { - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; - - for (i = 0; i < (total_size / page_size) - 1; i++) { - write_page_m29f400bt(flash, buf + i * page_size, i * page_size, page_size); - } - - 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; + return write_page_m29f400bt(flash, buf, 0, flash->total_size * 1024); } --- flashrom-partial_write_inner_function_signature/sharplhf00l04.c 2010-10-08 23:37:52.000000000 +0200 +++ flashrom-partial_write_inner_function_signature_simplify_calls/sharplhf00l04.c 2010-10-09 03:48:21.000000000 +0200 @@ -56,16 +56,3 @@ } return 0; } - -int write_lhf00l04(struct flashchip *flash, uint8_t *buf) -{ - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; - - for (i = 0; i < total_size / page_size; i++) { - write_page_82802ab(flash, buf + i * page_size, i * page_size, page_size); - } - - return 0; -} --- flashrom-partial_write_inner_function_signature/sst28sf040.c 2010-10-09 02:26:24.000000000 +0200 +++ flashrom-partial_write_inner_function_signature_simplify_calls/sst28sf040.c 2010-10-09 02:00:30.000000000 +0200 @@ -118,15 +118,9 @@ int write_28sf040(struct flashchip *flash, uint8_t *buf) { - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; - unprotect_28sf040(flash); - for (i = 0; i < total_size / page_size; i++) { - write_sector_28sf040(flash, buf + i * page_size, i * page_size, page_size); - } + write_sector_28sf040(flash, buf, 0, flash->total_size * 1024); protect_28sf040(flash); --- flashrom-partial_write_inner_function_signature/sst49lfxxxc.c 2010-10-09 00:18:55.000000000 +0200 +++ flashrom-partial_write_inner_function_signature_simplify_calls/sst49lfxxxc.c 2010-10-09 02:00:06.000000000 +0200 @@ -78,15 +78,10 @@ int write_49lfxxxc(struct flashchip *flash, uint8_t *buf) { - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; write_lockbits_49lfxxxc(flash, 0); - for (i = 0; i < total_size / page_size; i++) { - write_page_82802ab(flash, buf + i * page_size, i * page_size, page_size); - } + write_page_82802ab(flash, buf, 0, flash->total_size * 1024); chip_writeb(0xFF, bios); -- http://www.hailfinger.org/

2 2

[commit] r1209 - trunk
by repository service 10 Oct '10

10 Oct '10

Author: hailfinger Date: Sun Oct 10 18:10:49 2010 New Revision: 1209 URL: http://flashrom.org/trac/flashrom/changeset/1209 Log: Simplify calls to inner write functions. No behavioural changes, just equivalence transformations. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/82802ab.c trunk/jedec.c trunk/m29f400bt.c trunk/sharplhf00l04.c trunk/sst28sf040.c trunk/sst49lfxxxc.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Sun Oct 10 16:02:27 2010 (r1208) +++ trunk/82802ab.c Sun Oct 10 18:10:49 2010 (r1209) @@ -162,13 +162,7 @@ int write_82802ab(struct flashchip *flash, uint8_t *buf) { - int i; - - for (i = 0; i < flash->total_size; i++) { - write_page_82802ab(flash, buf + i * 1024, i * 1024, 1024); - } - - return 0; + return write_page_82802ab(flash, buf, 0, flash->total_size * 1024); } int unlock_28f004s5(struct flashchip *flash) Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Sun Oct 10 16:02:27 2010 (r1208) +++ trunk/jedec.c Sun Oct 10 18:10:49 2010 (r1209) @@ -411,16 +411,11 @@ int write_jedec_1(struct flashchip *flash, uint8_t * buf) { - int i; int mask; mask = getaddrmask(flash); - for (i = 0; i < flash->total_size; i++) { - write_sector_jedec_common(flash, buf + i * 1024, i * 1024, 1024, mask); - } - - return 0; + return write_sector_jedec_common(flash, buf, 0, flash->total_size * 1024, mask); } /* erase chip with block_erase() prototype */ Modified: trunk/m29f400bt.c ============================================================================== --- trunk/m29f400bt.c Sun Oct 10 16:02:27 2010 (r1208) +++ trunk/m29f400bt.c Sun Oct 10 18:10:49 2010 (r1209) @@ -142,18 +142,5 @@ int write_m29f400bt(struct flashchip *flash, uint8_t *buf) { - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; - - for (i = 0; i < (total_size / page_size) - 1; i++) { - write_page_m29f400bt(flash, buf + i * page_size, i * page_size, page_size); - } - - 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; + return write_page_m29f400bt(flash, buf, 0, flash->total_size * 1024); } Modified: trunk/sharplhf00l04.c ============================================================================== --- trunk/sharplhf00l04.c Sun Oct 10 16:02:27 2010 (r1208) +++ trunk/sharplhf00l04.c Sun Oct 10 18:10:49 2010 (r1209) @@ -56,16 +56,3 @@ } return 0; } - -int write_lhf00l04(struct flashchip *flash, uint8_t *buf) -{ - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; - - for (i = 0; i < total_size / page_size; i++) { - write_page_82802ab(flash, buf + i * page_size, i * page_size, page_size); - } - - return 0; -} Modified: trunk/sst28sf040.c ============================================================================== --- trunk/sst28sf040.c Sun Oct 10 16:02:27 2010 (r1208) +++ trunk/sst28sf040.c Sun Oct 10 18:10:49 2010 (r1209) @@ -118,15 +118,9 @@ int write_28sf040(struct flashchip *flash, uint8_t *buf) { - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; - unprotect_28sf040(flash); - for (i = 0; i < total_size / page_size; i++) { - write_sector_28sf040(flash, buf + i * page_size, i * page_size, page_size); - } + write_sector_28sf040(flash, buf, 0, flash->total_size * 1024); protect_28sf040(flash); Modified: trunk/sst49lfxxxc.c ============================================================================== --- trunk/sst49lfxxxc.c Sun Oct 10 16:02:27 2010 (r1208) +++ trunk/sst49lfxxxc.c Sun Oct 10 18:10:49 2010 (r1209) @@ -78,15 +78,10 @@ int write_49lfxxxc(struct flashchip *flash, uint8_t *buf) { - int i; - int total_size = flash->total_size * 1024; - int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; write_lockbits_49lfxxxc(flash, 0); - for (i = 0; i < total_size / page_size; i++) { - write_page_82802ab(flash, buf + i * page_size, i * page_size, page_size); - } + write_page_82802ab(flash, buf, 0, flash->total_size * 1024); chip_writeb(0xFF, bios);

1 0

[PATCH] Use common function signature for inner write functions
by Carl-Daniel Hailfinger 10 Oct '10

10 Oct '10

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 Change the function signature of wait_82802ab to eliminate single-use variables. 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. With these changes it becomes easy to remove the wrappers in the next step and use the inner write functions directly to allow partial write. The 80 column limit is ignored in a few places to help with readability while the code is in flux. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-partial_write_inner_function_signature/jedec.c =================================================================== --- flashrom-partial_write_inner_function_signature/jedec.c (Revision 1207) +++ flashrom-partial_write_inner_function_signature/jedec.c (Arbeitskopie) @@ -317,14 +317,14 @@ return failed; } -int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, - chipaddr dst, unsigned int page_size, unsigned int mask) +int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, int start, int len, unsigned int mask) { int i, failed = 0; + chipaddr dst = flash->virtual_memory + start; chipaddr olddst; olddst = dst; - for (i = 0; i < page_size; i++) { + for (i = 0; i < len; i++) { if (write_byte_program_jedec_common(flash, src, dst, mask)) failed = 1; dst++, src++; @@ -335,8 +335,7 @@ return failed; } -static int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, - int start, int page_size, unsigned int mask) +static int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, int start, int page_size, unsigned int mask) { int i, tried = 0, failed; uint8_t *s = src; @@ -403,8 +402,7 @@ mask = getaddrmask(flash); for (i = 0; i < total_size / page_size; i++) { - if (write_page_write_jedec_common(flash, buf + i * page_size, - i * page_size, page_size, mask)) + if (write_page_write_jedec_common(flash, buf + i * page_size, i * page_size, page_size, mask)) failed = 1; } @@ -414,14 +412,12 @@ int write_jedec_1(struct flashchip *flash, uint8_t * buf) { int i; - chipaddr bios = flash->virtual_memory; - chipaddr dst = bios; int mask; mask = getaddrmask(flash); for (i = 0; i < flash->total_size; i++) { - write_sector_jedec_common(flash, buf + i * 1024, dst + i * 1024, 1024, mask); + write_sector_jedec_common(flash, buf + i * 1024, i * 1024, 1024, mask); } return 0; Index: flashrom-partial_write_inner_function_signature/sst49lfxxxc.c =================================================================== --- flashrom-partial_write_inner_function_signature/sst49lfxxxc.c (Revision 1207) +++ flashrom-partial_write_inner_function_signature/sst49lfxxxc.c (Arbeitskopie) @@ -67,7 +67,7 @@ chip_writeb(0x30, bios); chip_writeb(0xD0, bios + address); - status = wait_82802ab(bios); + status = wait_82802ab(flash); if (check_erased_range(flash, address, sector_size)) { msg_cerr("ERASE FAILED!\n"); @@ -85,9 +85,7 @@ write_lockbits_49lfxxxc(flash, 0); for (i = 0; i < total_size / page_size; i++) { - /* write to the sector */ - write_page_82802ab(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_page_82802ab(flash, buf + i * page_size, i * page_size, page_size); } chip_writeb(0xFF, bios); Index: flashrom-partial_write_inner_function_signature/sharplhf00l04.c =================================================================== --- flashrom-partial_write_inner_function_signature/sharplhf00l04.c (Revision 1207) +++ flashrom-partial_write_inner_function_signature/sharplhf00l04.c (Arbeitskopie) @@ -23,6 +23,7 @@ /* FIXME: The datasheet is unclear whether we should use toggle_ready_jedec * or wait_82802ab. + * FIXME: This file is unused. */ int erase_lhf00l04_block(struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen) @@ -33,7 +34,7 @@ // clear status register chip_writeb(0x50, bios); - status = wait_82802ab(flash->virtual_memory); + status = wait_82802ab(flash); print_status_82802ab(status); // clear write protect msg_cspew("write protect is at 0x%lx\n", (wrprotect)); @@ -46,7 +47,7 @@ chip_writeb(0xd0, bios); programmer_delay(10); // now let's see what the register is - status = wait_82802ab(flash->virtual_memory); + status = wait_82802ab(flash); print_status_82802ab(status); if (check_erased_range(flash, blockaddr, blocklen)) { @@ -61,11 +62,9 @@ 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; i++) { - write_page_82802ab(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_page_82802ab(flash, buf + i * page_size, i * page_size, page_size); } return 0; Index: flashrom-partial_write_inner_function_signature/Makefile =================================================================== --- flashrom-partial_write_inner_function_signature/Makefile (Revision 1207) +++ flashrom-partial_write_inner_function_signature/Makefile (Arbeitskopie) @@ -84,7 +84,7 @@ CHIP_OBJS = jedec.o stm50flw0x0x.o w39v040c.o w39v080fa.o w29ee011.o \ sst28sf040.o m29f400bt.o 82802ab.o pm49fl00x.o \ - sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o + sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o sharplhf00l04.o LIB_OBJS = layout.o Index: flashrom-partial_write_inner_function_signature/82802ab.c =================================================================== --- flashrom-partial_write_inner_function_signature/82802ab.c (Revision 1207) +++ flashrom-partial_write_inner_function_signature/82802ab.c (Arbeitskopie) @@ -88,9 +88,10 @@ return 1; } -uint8_t wait_82802ab(chipaddr bios) +uint8_t wait_82802ab(struct flashchip *flash) { uint8_t status; + chipaddr bios = flash->virtual_memory; chip_writeb(0x70, bios); if ((chip_readb(bios) & 0x80) == 0) { // it's busy @@ -132,7 +133,7 @@ programmer_delay(10); // now let's see what the register is - status = wait_82802ab(bios); + status = wait_82802ab(flash); print_status_82802ab(status); if (check_erased_range(flash, page, pagesize)) { @@ -143,26 +144,25 @@ return 0; } -void write_page_82802ab(chipaddr bios, uint8_t *src, - chipaddr dst, int page_size) +void write_page_82802ab(struct flashchip *flash, uint8_t *src, int start, int len) { int i; + chipaddr dst = flash->virtual_memory + start; - for (i = 0; i < page_size; i++) { + for (i = 0; i < len; i++) { /* transfer data from source to destination */ chip_writeb(0x40, dst); chip_writeb(*src++, dst++); - wait_82802ab(bios); + wait_82802ab(flash); } } int write_82802ab(struct flashchip *flash, uint8_t *buf) { int i; - chipaddr bios = flash->virtual_memory; for (i = 0; i < flash->total_size; i++) { - write_page_82802ab(bios, buf + i * 1024, bios + i * 1024, 1024); + write_page_82802ab(flash, buf + i * 1024, i * 1024, 1024); } return 0; Index: flashrom-partial_write_inner_function_signature/sst28sf040.c =================================================================== --- flashrom-partial_write_inner_function_signature/sst28sf040.c (Revision 1207) +++ flashrom-partial_write_inner_function_signature/sst28sf040.c (Arbeitskopie) @@ -30,8 +30,10 @@ #define RESET 0xFF #define READ_ID 0x90 -static void protect_28sf040(chipaddr bios) +static void protect_28sf040(struct flashchip *flash) { + chipaddr bios = flash->virtual_memory; + chip_readb(bios + 0x1823); chip_readb(bios + 0x1820); chip_readb(bios + 0x1822); @@ -41,8 +43,10 @@ chip_readb(bios + 0x040A); } -static void unprotect_28sf040(chipaddr bios) +static void unprotect_28sf040(struct flashchip *flash) { + chipaddr bios = flash->virtual_memory; + chip_readb(bios + 0x1823); chip_readb(bios + 0x1820); chip_readb(bios + 0x1822); @@ -59,7 +63,7 @@ chip_writeb(AUTO_PG_ERASE1, bios); chip_writeb(AUTO_PG_ERASE2, bios + address); - /* wait for Toggle bit ready */ + /* wait for Toggle bit ready */ toggle_ready_jedec(bios); if (check_erased_range(flash, address, sector_size)) { @@ -69,12 +73,13 @@ return 0; } -static int write_sector_28sf040(chipaddr bios, uint8_t *src, chipaddr dst, - unsigned int page_size) +static int write_sector_28sf040(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++) { /* transfer data from source to destination */ if (*src == 0xFF) { dst++, src++; @@ -96,10 +101,10 @@ { chipaddr bios = flash->virtual_memory; - unprotect_28sf040(bios); + unprotect_28sf040(flash); chip_writeb(CHIP_ERASE, bios); chip_writeb(CHIP_ERASE, bios); - protect_28sf040(bios); + protect_28sf040(flash); programmer_delay(10); toggle_ready_jedec(bios); @@ -116,17 +121,14 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - chipaddr bios = flash->virtual_memory; - unprotect_28sf040(bios); + unprotect_28sf040(flash); for (i = 0; i < total_size / page_size; i++) { - /* write to the sector */ - write_sector_28sf040(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_sector_28sf040(flash, buf + i * page_size, i * page_size, page_size); } - protect_28sf040(bios); + protect_28sf040(flash); return 0; } Index: flashrom-partial_write_inner_function_signature/stm50flw0x0x.c =================================================================== --- flashrom-partial_write_inner_function_signature/stm50flw0x0x.c (Revision 1207) +++ flashrom-partial_write_inner_function_signature/stm50flw0x0x.c (Arbeitskopie) @@ -105,7 +105,7 @@ chip_writeb(0xd0, bios); programmer_delay(10); - wait_82802ab(flash->virtual_memory); + wait_82802ab(flash); if (check_erased_range(flash, sector, sectorsize)) { msg_cerr("ERASE FAILED!\n"); Index: flashrom-partial_write_inner_function_signature/m29f400bt.c =================================================================== --- flashrom-partial_write_inner_function_signature/m29f400bt.c (Revision 1207) +++ flashrom-partial_write_inner_function_signature/m29f400bt.c (Arbeitskopie) @@ -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) +void 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); @@ -138,20 +139,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(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); - 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); - return 0; } Index: flashrom-partial_write_inner_function_signature/chipdrivers.h =================================================================== --- flashrom-partial_write_inner_function_signature/chipdrivers.h (Revision 1207) +++ flashrom-partial_write_inner_function_signature/chipdrivers.h (Arbeitskopie) @@ -65,12 +65,12 @@ int spi_aai_write(struct flashchip *flash, uint8_t *buf); /* 82802ab.c */ -uint8_t wait_82802ab(chipaddr bios); +uint8_t wait_82802ab(struct flashchip *flash); int probe_82802ab(struct flashchip *flash); int erase_block_82802ab(struct flashchip *flash, unsigned int page, unsigned int pagesize); int write_82802ab(struct flashchip *flash, uint8_t *buf); void print_status_82802ab(uint8_t status); -void write_page_82802ab(chipaddr bios, uint8_t *src, chipaddr dst, int page_size); +void write_page_82802ab(struct flashchip *flash, uint8_t *src, int start, int len); int unlock_82802ab(struct flashchip *flash); int unlock_28f004s5(struct flashchip *flash); @@ -86,7 +86,7 @@ int erase_sector_jedec(struct flashchip *flash, unsigned int page, unsigned int pagesize); int erase_block_jedec(struct flashchip *flash, unsigned int page, unsigned int blocksize); int erase_chip_block_jedec(struct flashchip *flash, unsigned int page, unsigned int blocksize); -int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, chipaddr dst, unsigned int page_size, unsigned int mask); +int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, int start, int len, unsigned int mask); /* m29f400bt.c */ int probe_m29f400bt(struct flashchip *flash); @@ -94,8 +94,7 @@ int block_erase_chip_m29f400bt(struct flashchip *flash, unsigned int start, unsigned int len); int write_m29f400bt(struct flashchip *flash, uint8_t *buf); void protect_m29f400bt(chipaddr bios); -void write_page_m29f400bt(chipaddr bios, uint8_t *src, - chipaddr dst, int page_size); +void write_page_m29f400bt(struct flashchip *flash, uint8_t *src, int start, int len); /* pm49fl00x.c */ int unlock_49fl00x(struct flashchip *flash); -- http://www.hailfinger.org/

2 3

[commit] r1208 - trunk
by repository service 10 Oct '10

10 Oct '10

Author: hailfinger Date: Sun Oct 10 16:02:27 2010 New Revision: 1208 URL: http://flashrom.org/trac/flashrom/changeset/1208 Log: 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. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/82802ab.c trunk/Makefile trunk/chipdrivers.h trunk/jedec.c trunk/m29f400bt.c trunk/sharplhf00l04.c trunk/sst28sf040.c trunk/sst49lfxxxc.c trunk/stm50flw0x0x.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/82802ab.c Sun Oct 10 16:02:27 2010 (r1208) @@ -88,9 +88,10 @@ return 1; } -uint8_t wait_82802ab(chipaddr bios) +uint8_t wait_82802ab(struct flashchip *flash) { uint8_t status; + chipaddr bios = flash->virtual_memory; chip_writeb(0x70, bios); if ((chip_readb(bios) & 0x80) == 0) { // it's busy @@ -132,7 +133,7 @@ programmer_delay(10); // now let's see what the register is - status = wait_82802ab(bios); + status = wait_82802ab(flash); print_status_82802ab(status); if (check_erased_range(flash, page, pagesize)) { @@ -143,26 +144,28 @@ return 0; } -void write_page_82802ab(chipaddr bios, uint8_t *src, - chipaddr dst, int page_size) +int write_page_82802ab(struct flashchip *flash, uint8_t *src, int start, int len) { int i; + chipaddr dst = flash->virtual_memory + start; - for (i = 0; i < page_size; i++) { + for (i = 0; i < len; i++) { /* transfer data from source to destination */ chip_writeb(0x40, dst); chip_writeb(*src++, dst++); - wait_82802ab(bios); + wait_82802ab(flash); } + + /* FIXME: Ignore errors for now. */ + return 0; } int write_82802ab(struct flashchip *flash, uint8_t *buf) { int i; - chipaddr bios = flash->virtual_memory; for (i = 0; i < flash->total_size; i++) { - write_page_82802ab(bios, buf + i * 1024, bios + i * 1024, 1024); + write_page_82802ab(flash, buf + i * 1024, i * 1024, 1024); } return 0; Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/Makefile Sun Oct 10 16:02:27 2010 (r1208) @@ -84,7 +84,7 @@ CHIP_OBJS = jedec.o stm50flw0x0x.o w39v040c.o w39v080fa.o w29ee011.o \ sst28sf040.o m29f400bt.o 82802ab.o pm49fl00x.o \ - sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o + sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o sharplhf00l04.o LIB_OBJS = layout.o Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/chipdrivers.h Sun Oct 10 16:02:27 2010 (r1208) @@ -65,12 +65,12 @@ int spi_aai_write(struct flashchip *flash, uint8_t *buf); /* 82802ab.c */ -uint8_t wait_82802ab(chipaddr bios); +uint8_t wait_82802ab(struct flashchip *flash); int probe_82802ab(struct flashchip *flash); int erase_block_82802ab(struct flashchip *flash, unsigned int page, unsigned int pagesize); int write_82802ab(struct flashchip *flash, uint8_t *buf); void print_status_82802ab(uint8_t status); -void write_page_82802ab(chipaddr bios, uint8_t *src, chipaddr dst, int page_size); +int write_page_82802ab(struct flashchip *flash, uint8_t *src, int start, int len); int unlock_82802ab(struct flashchip *flash); int unlock_28f004s5(struct flashchip *flash); @@ -86,7 +86,8 @@ int erase_sector_jedec(struct flashchip *flash, unsigned int page, unsigned int pagesize); int erase_block_jedec(struct flashchip *flash, unsigned int page, unsigned int blocksize); int erase_chip_block_jedec(struct flashchip *flash, unsigned int page, unsigned int blocksize); -int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, chipaddr dst, unsigned int page_size, unsigned int mask); +int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, int start, int len, unsigned int mask); +int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, int start, int page_size, unsigned int mask); /* m29f400bt.c */ int probe_m29f400bt(struct flashchip *flash); @@ -94,8 +95,7 @@ int block_erase_chip_m29f400bt(struct flashchip *flash, unsigned int start, unsigned int len); int write_m29f400bt(struct flashchip *flash, uint8_t *buf); void protect_m29f400bt(chipaddr bios); -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); /* pm49fl00x.c */ int unlock_49fl00x(struct flashchip *flash); @@ -105,6 +105,7 @@ int erase_chip_28sf040(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int erase_sector_28sf040(struct flashchip *flash, unsigned int address, unsigned int sector_size); int write_28sf040(struct flashchip *flash, uint8_t *buf); +int write_sector_28sf040(struct flashchip *flash, uint8_t *src, int start, int len); /* sst49lfxxxc.c */ int erase_sector_49lfxxxc(struct flashchip *flash, unsigned int address, unsigned int sector_size); Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/jedec.c Sun Oct 10 16:02:27 2010 (r1208) @@ -317,14 +317,14 @@ return failed; } -int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, - chipaddr dst, unsigned int page_size, unsigned int mask) +int write_sector_jedec_common(struct flashchip *flash, uint8_t *src, int start, int len, unsigned int mask) { int i, failed = 0; + chipaddr dst = flash->virtual_memory + start; chipaddr olddst; olddst = dst; - for (i = 0; i < page_size; i++) { + for (i = 0; i < len; i++) { if (write_byte_program_jedec_common(flash, src, dst, mask)) failed = 1; dst++, src++; @@ -335,8 +335,7 @@ return failed; } -static int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, - int start, int page_size, unsigned int mask) +int write_page_write_jedec_common(struct flashchip *flash, uint8_t *src, int start, int page_size, unsigned int mask) { int i, tried = 0, failed; uint8_t *s = src; @@ -403,8 +402,7 @@ mask = getaddrmask(flash); for (i = 0; i < total_size / page_size; i++) { - if (write_page_write_jedec_common(flash, buf + i * page_size, - i * page_size, page_size, mask)) + if (write_page_write_jedec_common(flash, buf + i * page_size, i * page_size, page_size, mask)) failed = 1; } @@ -414,14 +412,12 @@ int write_jedec_1(struct flashchip *flash, uint8_t * buf) { int i; - chipaddr bios = flash->virtual_memory; - chipaddr dst = bios; int mask; mask = getaddrmask(flash); for (i = 0; i < flash->total_size; i++) { - write_sector_jedec_common(flash, buf + i * 1024, dst + i * 1024, 1024, mask); + write_sector_jedec_common(flash, buf + i * 1024, i * 1024, 1024, mask); } return 0; Modified: trunk/m29f400bt.c ============================================================================== --- trunk/m29f400bt.c Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/m29f400bt.c Sun Oct 10 16:02:27 2010 (r1208) @@ -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; } Modified: trunk/sharplhf00l04.c ============================================================================== --- trunk/sharplhf00l04.c Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/sharplhf00l04.c Sun Oct 10 16:02:27 2010 (r1208) @@ -23,6 +23,7 @@ /* FIXME: The datasheet is unclear whether we should use toggle_ready_jedec * or wait_82802ab. + * FIXME: This file is unused. */ int erase_lhf00l04_block(struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen) @@ -33,7 +34,7 @@ // clear status register chip_writeb(0x50, bios); - status = wait_82802ab(flash->virtual_memory); + status = wait_82802ab(flash); print_status_82802ab(status); // clear write protect msg_cspew("write protect is at 0x%lx\n", (wrprotect)); @@ -46,7 +47,7 @@ chip_writeb(0xd0, bios); programmer_delay(10); // now let's see what the register is - status = wait_82802ab(flash->virtual_memory); + status = wait_82802ab(flash); print_status_82802ab(status); if (check_erased_range(flash, blockaddr, blocklen)) { @@ -61,11 +62,9 @@ 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; i++) { - write_page_82802ab(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_page_82802ab(flash, buf + i * page_size, i * page_size, page_size); } return 0; Modified: trunk/sst28sf040.c ============================================================================== --- trunk/sst28sf040.c Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/sst28sf040.c Sun Oct 10 16:02:27 2010 (r1208) @@ -30,8 +30,10 @@ #define RESET 0xFF #define READ_ID 0x90 -static void protect_28sf040(chipaddr bios) +static void protect_28sf040(struct flashchip *flash) { + chipaddr bios = flash->virtual_memory; + chip_readb(bios + 0x1823); chip_readb(bios + 0x1820); chip_readb(bios + 0x1822); @@ -41,8 +43,10 @@ chip_readb(bios + 0x040A); } -static void unprotect_28sf040(chipaddr bios) +static void unprotect_28sf040(struct flashchip *flash) { + chipaddr bios = flash->virtual_memory; + chip_readb(bios + 0x1823); chip_readb(bios + 0x1820); chip_readb(bios + 0x1822); @@ -59,7 +63,7 @@ chip_writeb(AUTO_PG_ERASE1, bios); chip_writeb(AUTO_PG_ERASE2, bios + address); - /* wait for Toggle bit ready */ + /* wait for Toggle bit ready */ toggle_ready_jedec(bios); if (check_erased_range(flash, address, sector_size)) { @@ -69,12 +73,13 @@ return 0; } -static int write_sector_28sf040(chipaddr bios, uint8_t *src, chipaddr dst, - unsigned int page_size) +int write_sector_28sf040(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++) { /* transfer data from source to destination */ if (*src == 0xFF) { dst++, src++; @@ -96,10 +101,10 @@ { chipaddr bios = flash->virtual_memory; - unprotect_28sf040(bios); + unprotect_28sf040(flash); chip_writeb(CHIP_ERASE, bios); chip_writeb(CHIP_ERASE, bios); - protect_28sf040(bios); + protect_28sf040(flash); programmer_delay(10); toggle_ready_jedec(bios); @@ -116,17 +121,14 @@ int i; int total_size = flash->total_size * 1024; int page_size = flash->page_size; - chipaddr bios = flash->virtual_memory; - unprotect_28sf040(bios); + unprotect_28sf040(flash); for (i = 0; i < total_size / page_size; i++) { - /* write to the sector */ - write_sector_28sf040(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_sector_28sf040(flash, buf + i * page_size, i * page_size, page_size); } - protect_28sf040(bios); + protect_28sf040(flash); return 0; } Modified: trunk/sst49lfxxxc.c ============================================================================== --- trunk/sst49lfxxxc.c Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/sst49lfxxxc.c Sun Oct 10 16:02:27 2010 (r1208) @@ -67,7 +67,7 @@ chip_writeb(0x30, bios); chip_writeb(0xD0, bios + address); - status = wait_82802ab(bios); + status = wait_82802ab(flash); if (check_erased_range(flash, address, sector_size)) { msg_cerr("ERASE FAILED!\n"); @@ -85,9 +85,7 @@ write_lockbits_49lfxxxc(flash, 0); for (i = 0; i < total_size / page_size; i++) { - /* write to the sector */ - write_page_82802ab(bios, buf + i * page_size, - bios + i * page_size, page_size); + write_page_82802ab(flash, buf + i * page_size, i * page_size, page_size); } chip_writeb(0xFF, bios); Modified: trunk/stm50flw0x0x.c ============================================================================== --- trunk/stm50flw0x0x.c Fri Oct 8 22:29:57 2010 (r1207) +++ trunk/stm50flw0x0x.c Sun Oct 10 16:02:27 2010 (r1208) @@ -105,7 +105,7 @@ chip_writeb(0xd0, bios); programmer_delay(10); - wait_82802ab(flash->virtual_memory); + wait_82802ab(flash); if (check_erased_range(flash, sector, sectorsize)) { msg_cerr("ERASE FAILED!\n");

1 0

Manually setting upper address lines (parallel flash)
by max 10 Oct '10

10 Oct '10

Suppose you want to program a 2mb parallel flash chip but the board only supports 1mb. Assuming the flash chip ignores the upper address line when decoding the command addresses (e.g. 5555) - then it should be possible to manually tie the upper address line to 0V/5V and program half at a time, yes? For programming software to allow this trick, it is required that a "write without chip erase" option be available. Then the user can run the program twice, first with chip erase and the second time (after manually changing the upper address line) without chip erase. Thanks, Dan

2 1

DOS binary doesn't work?
by max 10 Oct '10

10 Oct '10

I tried to run the DOS binary found here: http://khepri.coresystems.de/~idwer/flashrom/ But it gave this message: No coreboot table found. DMI pipe open error Is this version supposed to work? Something I'm doing wrong? Thanks, Dan

4 18

[PATCH] Remove progress printing
by Carl-Daniel Hailfinger 08 Oct '10

08 Oct '10

Remove progress printing from individual flash chip drivers. Progress printing should be handled in the generic code, and will end up there once partial write is possible. In the meantime, progress printing in flash chip drivers makes conversion to partial write difficult and that's why I want to kill it. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-kill_progressprinting/jedec.c =================================================================== --- flashrom-kill_progressprinting/jedec.c (Revision 1206) +++ flashrom-kill_progressprinting/jedec.c (Arbeitskopie) @@ -402,15 +402,11 @@ mask = getaddrmask(flash); - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - msg_cinfo("%04d at address: 0x%08x", i, i * page_size); if (write_page_write_jedec_common(flash, buf + i * page_size, i * page_size, page_size, mask)) failed = 1; - msg_cinfo("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } - msg_cinfo("DONE!\n"); return failed; } @@ -424,18 +420,10 @@ mask = getaddrmask(flash); - msg_cinfo("Programming page: "); for (i = 0; i < flash->total_size; i++) { - if ((i & 0x3) == 0) - msg_cinfo("address: 0x%08lx", (unsigned long)i * 1024); - write_sector_jedec_common(flash, buf + i * 1024, dst + i * 1024, 1024, mask); - - if ((i & 0x3) == 0) - msg_cinfo("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } - msg_cinfo("DONE!\n"); return 0; } Index: flashrom-kill_progressprinting/sst49lfxxxc.c =================================================================== --- flashrom-kill_progressprinting/sst49lfxxxc.c (Revision 1206) +++ flashrom-kill_progressprinting/sst49lfxxxc.c (Arbeitskopie) @@ -84,16 +84,11 @@ chipaddr bios = flash->virtual_memory; write_lockbits_49lfxxxc(flash, 0); - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - /* write to the sector */ - msg_cinfo("%04d at address: 0x%08x", i, i * page_size); write_page_82802ab(bios, buf + i * page_size, bios + i * page_size, page_size); - msg_cinfo("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } - msg_cinfo("\n"); chip_writeb(0xFF, bios); Index: flashrom-kill_progressprinting/sharplhf00l04.c =================================================================== --- flashrom-kill_progressprinting/sharplhf00l04.c (Revision 1206) +++ flashrom-kill_progressprinting/sharplhf00l04.c (Arbeitskopie) @@ -33,7 +33,6 @@ // clear status register chip_writeb(0x50, bios); - msg_cdbg("Erase at 0x%lx\n", bios); status = wait_82802ab(flash->virtual_memory); print_status_82802ab(status); // clear write protect @@ -49,7 +48,6 @@ // now let's see what the register is status = wait_82802ab(flash->virtual_memory); print_status_82802ab(status); - msg_cinfo("DONE BLOCK 0x%x\n", blockaddr); if (check_erased_range(flash, blockaddr, blocklen)) { msg_cerr("ERASE FAILED!\n"); @@ -65,14 +63,10 @@ int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - msg_cinfo("%04d at address: 0x%08x", i, i * page_size); write_page_82802ab(bios, buf + i * page_size, bios + i * page_size, page_size); - msg_cinfo("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } - msg_cinfo("\n"); return 0; } Index: flashrom-kill_progressprinting/82802ab.c =================================================================== --- flashrom-kill_progressprinting/82802ab.c (Revision 1206) +++ flashrom-kill_progressprinting/82802ab.c (Arbeitskopie) @@ -139,7 +139,6 @@ msg_cerr("ERASE FAILED!\n"); return -1; } - msg_cinfo("DONE BLOCK 0x%x\n", page); return 0; } @@ -162,18 +161,10 @@ int i; chipaddr bios = flash->virtual_memory; - msg_cinfo("Programming at: "); for (i = 0; i < flash->total_size; i++) { - if ((i & 0x3) == 0) - msg_cinfo("address: 0x%08lx", (unsigned long)i * 1024); - write_page_82802ab(bios, buf + i * 1024, bios + i * 1024, 1024); - - if ((i & 0x3) == 0) - msg_cinfo("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } - msg_cinfo("DONE!\n"); return 0; } Index: flashrom-kill_progressprinting/sst28sf040.c =================================================================== --- flashrom-kill_progressprinting/sst28sf040.c (Revision 1206) +++ flashrom-kill_progressprinting/sst28sf040.c (Arbeitskopie) @@ -120,15 +120,11 @@ unprotect_28sf040(bios); - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { /* write to the sector */ - msg_cinfo("%04d at address: 0x%08x", i, i * page_size); write_sector_28sf040(bios, buf + i * page_size, bios + i * page_size, page_size); - msg_cinfo("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } - msg_cinfo("\n"); protect_28sf040(bios); Index: flashrom-kill_progressprinting/stm50flw0x0x.c =================================================================== --- flashrom-kill_progressprinting/stm50flw0x0x.c (Revision 1206) +++ flashrom-kill_progressprinting/stm50flw0x0x.c (Arbeitskopie) @@ -100,7 +100,6 @@ // clear status register chip_writeb(0x50, bios); - msg_cdbg("Erase at 0x%lx\n", bios); // now start it chip_writeb(0x32, bios); chip_writeb(0xd0, bios); @@ -112,7 +111,6 @@ msg_cerr("ERASE FAILED!\n"); return -1; } - msg_cinfo("DONE BLOCK 0x%x\n", sector); return 0; } @@ -130,10 +128,7 @@ return -1; } - msg_cinfo("Erasing page:\n"); for (i = 0; i < total_size / page_size; i++) { - msg_cinfo("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); - msg_cinfo("%04d at address: 0x%08x ", i, i * page_size); //if (unlock_block_stm50flw0x0x(flash, i * page_size)) { // msg_cerr("UNLOCK FAILED!\n"); // return -1; @@ -143,7 +138,6 @@ return -1; } } - msg_cinfo("\n"); return 0; } Index: flashrom-kill_progressprinting/m29f400bt.c =================================================================== --- flashrom-kill_progressprinting/m29f400bt.c (Revision 1206) +++ flashrom-kill_progressprinting/m29f400bt.c (Arbeitskopie) @@ -39,8 +39,6 @@ /* transfer data from source to destination */ chip_writeb(*src, dst); - //chip_writeb(0xF0, bios); - //programmer_delay(5); toggle_ready_jedec(dst); msg_cerr("Value in the flash at address 0x%lx = %#x, want %#x\n", (dst - bios), chip_readb(dst), *src); @@ -113,7 +111,6 @@ chip_writeb(0xAA, bios + 0xAAA); chip_writeb(0x55, bios + 0x555); - //chip_writeb(0x10, bios + 0xAAA); chip_writeb(0x30, dst); programmer_delay(10); @@ -143,43 +140,18 @@ int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; - msg_cinfo("Programming page:\n "); - /********************************* - *Pages for M29F400BT: - * 16 0x7c000 0x7ffff TOP - * 8 0x7a000 0x7bfff - * 8 0x78000 0x79fff - * 32 0x70000 0x77fff - * 64 0x60000 0x6ffff - * 64 0x50000 0x5ffff - * 64 0x40000 0x4ffff - *--------------------------------- - * 64 0x30000 0x3ffff - * 64 0x20000 0x2ffff - * 64 0x10000 0x1ffff - * 64 0x00000 0x0ffff BOTTOM - *********************************/ - msg_cinfo("total_size/page_size = %d\n", total_size / page_size); for (i = 0; i < (total_size / page_size) - 1; i++) { - msg_cinfo("%04d at address: 0x%08x\n", i, i * page_size); write_page_m29f400bt(bios, buf + i * page_size, bios + i * page_size, page_size); - msg_cinfo("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b"); } - msg_cinfo("%04d at address: 0x%08x\n", 7, 0x70000); write_page_m29f400bt(bios, buf + 0x70000, bios + 0x70000, 32 * 1024); - msg_cinfo("%04d at address: 0x%08x\n", 8, 0x78000); write_page_m29f400bt(bios, buf + 0x78000, bios + 0x78000, 8 * 1024); - msg_cinfo("%04d at address: 0x%08x\n", 9, 0x7a000); write_page_m29f400bt(bios, buf + 0x7a000, bios + 0x7a000, 8 * 1024); - msg_cinfo("%04d at address: 0x%08x\n", 10, 0x7c000); write_page_m29f400bt(bios, buf + 0x7c000, bios + 0x7c000, 16 * 1024); - msg_cinfo("\n"); - return 0; } -- http://www.hailfinger.org/

2 2

← Newer
1
...
9
10
11
12
13
14
15
...
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom October 2010