flashrom October 2010

flashrom@flashrom.org

66 participants
181 discussions

[commit] r1207 - trunk
by repository service 08 Oct '10

08 Oct '10

Author: hailfinger Date: Fri Oct 8 22:29:57 2010 New Revision: 1207 URL: http://flashrom.org/trac/flashrom/changeset/1207 Log: 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. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/82802ab.c 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 20:52:29 2010 (r1206) +++ trunk/82802ab.c Fri Oct 8 22:29:57 2010 (r1207) @@ -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; } Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Fri Oct 8 20:52:29 2010 (r1206) +++ trunk/jedec.c Fri Oct 8 22:29:57 2010 (r1207) @@ -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; } Modified: trunk/m29f400bt.c ============================================================================== --- trunk/m29f400bt.c Fri Oct 8 20:52:29 2010 (r1206) +++ trunk/m29f400bt.c Fri Oct 8 22:29:57 2010 (r1207) @@ -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; } Modified: trunk/sharplhf00l04.c ============================================================================== --- trunk/sharplhf00l04.c Fri Oct 8 20:52:29 2010 (r1206) +++ trunk/sharplhf00l04.c Fri Oct 8 22:29:57 2010 (r1207) @@ -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; } Modified: trunk/sst28sf040.c ============================================================================== --- trunk/sst28sf040.c Fri Oct 8 20:52:29 2010 (r1206) +++ trunk/sst28sf040.c Fri Oct 8 22:29:57 2010 (r1207) @@ -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); Modified: trunk/sst49lfxxxc.c ============================================================================== --- trunk/sst49lfxxxc.c Fri Oct 8 20:52:29 2010 (r1206) +++ trunk/sst49lfxxxc.c Fri Oct 8 22:29:57 2010 (r1207) @@ -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); Modified: trunk/stm50flw0x0x.c ============================================================================== --- trunk/stm50flw0x0x.c Fri Oct 8 20:52:29 2010 (r1206) +++ trunk/stm50flw0x0x.c Fri Oct 8 22:29:57 2010 (r1207) @@ -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; }

1 0

[PATCH] Move implicit erase out of chip drivers, clean up
by Carl-Daniel Hailfinger 08 Oct '10

08 Oct '10

flashrom had an implicit erase-on-write for most flash chip and programmer drivers, but it was not entirely consistent. Some drivers had their own hand-rolled partial update functionality which made handling partial updates from generic code impossible. Move implicit erase out of chip drivers, clean up the chip write functions at the same time. A full chip erase is now performed in the generic code for all flash chips on write, and after that the whole chip is written. This is needed before we can change write function signature of the write functions to take start+len. Side note: With this patch and one or two followup patches, more functions will be easily recognizable as duplicates and can be eliminated. Compile tested and proofread, but that's it. The patch may cause flashrom to eat your dog or it may cause your dog to eat burned flash chips. Please test on real hardware. Thanks! Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-partial_write_no_autoerase/flash.h =================================================================== --- flashrom-partial_write_no_autoerase/flash.h (Revision 1005) +++ flashrom-partial_write_no_autoerase/flash.h (Arbeitskopie) @@ -676,7 +676,7 @@ int sb600_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int sb600_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); -int sb600_spi_write_1(struct flashchip *flash, uint8_t *buf); +int sb600_spi_write_256(struct flashchip *flash, uint8_t *buf); extern uint8_t *sb600_spibar; /* wbsio_spi.c */ Index: flashrom-partial_write_no_autoerase/spi25.c =================================================================== --- flashrom-partial_write_no_autoerase/spi25.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/spi25.c (Arbeitskopie) @@ -875,6 +875,7 @@ /* * Read a part of the flash chip. + * FIXME: Use the chunk code from Michael Karcher instead. * Each page is read separately in chunks with a maximum size of chunksize. */ int spi_read_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize) @@ -914,6 +915,7 @@ /* * Write a part of the flash chip. + * FIXME: Use the chunk code from Michael Karcher instead. * Each page is written separately in chunks with a maximum size of chunksize. */ int spi_write_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize) @@ -964,20 +966,13 @@ * and for chips where memory mapped programming is impossible * (e.g. due to size constraints in IT87* for over 512 kB) */ +/* real chunksize is 1, logical chunksize is 1 */ int spi_chip_write_1(struct flashchip *flash, uint8_t *buf) { - int total_size = 1024 * flash->total_size; int i, result = 0; spi_disable_blockprotect(); - /* Erase first */ - msg_cinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - msg_cinfo("done.\n"); - for (i = 0; i < total_size; i++) { + for (i = 0; i < flash->total_size * 1024; i++) { result = spi_byte_program(i, buf[i]); if (result) return 1; @@ -988,6 +983,7 @@ return 0; } +/* FIXME: Unused function, not easily convertable to partial write. */ int spi_aai_write(struct flashchip *flash, uint8_t *buf) { uint32_t pos = 2, size = flash->total_size * 1024; @@ -1004,10 +1000,6 @@ default: break; } - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } /* FIXME: This will fail on ICH/VIA SPI. */ result = spi_write_enable(); if (result) Index: flashrom-partial_write_no_autoerase/it87spi.c =================================================================== --- flashrom-partial_write_no_autoerase/it87spi.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/it87spi.c (Arbeitskopie) @@ -326,25 +326,19 @@ int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf) { - int total_size = 1024 * flash->total_size; int i; /* * IT8716F only allows maximum of 512 kb SPI chip size for memory * mapped access. */ - if ((programmer == PROGRAMMER_IT87SPI) || (total_size > 512 * 1024)) { + if ((programmer == PROGRAMMER_IT87SPI) || (flash->total_size * 1024 > 512 * 1024)) { spi_chip_write_1(flash, buf); } else { spi_disable_blockprotect(); - /* Erase first */ - msg_pinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_perr("ERASE FAILED!\n"); - return -1; - } - msg_pinfo("done.\n"); - for (i = 0; i < total_size / 256; i++) { + + /* FIXME: Handle chips which have max writechunk size >1 and <256. */ + for (i = 0; i < flash->total_size * 1024 / 256; i++) { it8716f_spi_page_program(flash, i, buf); } } Index: flashrom-partial_write_no_autoerase/buspirate_spi.c =================================================================== --- flashrom-partial_write_no_autoerase/buspirate_spi.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/buspirate_spi.c (Arbeitskopie) @@ -318,16 +318,6 @@ int buspirate_spi_write_256(struct flashchip *flash, uint8_t *buf) { - int total_size = 1024 * flash->total_size; - spi_disable_blockprotect(); - /* Erase first. */ - msg_pinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_perr("ERASE FAILED!\n"); - return -1; - } - msg_pinfo("done.\n"); - - return spi_write_chunked(flash, buf, 0, total_size, 12); + return spi_write_chunked(flash, buf, 0, flash->total_size * 1024, 12); } Index: flashrom-partial_write_no_autoerase/jedec.c =================================================================== --- flashrom-partial_write_no_autoerase/jedec.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/jedec.c (Arbeitskopie) @@ -393,6 +393,7 @@ } } +/* real chunksize is page_size, logical chunksize is page_size */ int write_jedec(struct flashchip *flash, uint8_t *buf) { int mask; @@ -402,52 +403,23 @@ mask = getaddrmask(flash); - if (erase_chip_jedec(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - - 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)) + 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; } +/* real chunksize is 1, logical chunksize is 1 */ int write_jedec_1(struct flashchip *flash, uint8_t * buf) { - int i; - chipaddr bios = flash->virtual_memory; - chipaddr dst = bios; + chipaddr dst = flash->virtual_memory; int mask; mask = getaddrmask(flash); - programmer_delay(10); - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - - 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; + return write_sector_jedec_common(flash, buf, dst, flash->total_size * 1024, mask); } /* erase chip with block_erase() prototype */ Index: flashrom-partial_write_no_autoerase/bitbang_spi.c =================================================================== --- flashrom-partial_write_no_autoerase/bitbang_spi.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/bitbang_spi.c (Arbeitskopie) @@ -141,8 +141,5 @@ int bitbang_spi_write_256(struct flashchip *flash, uint8_t *buf) { - int total_size = 1024 * flash->total_size; - - msg_pdbg("total_size is %d\n", total_size); - return spi_write_chunked(flash, buf, 0, total_size, 256); + return spi_write_chunked(flash, buf, 0, flash->total_size * 1024, 256); } Index: flashrom-partial_write_no_autoerase/sst49lfxxxc.c =================================================================== --- flashrom-partial_write_no_autoerase/sst49lfxxxc.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/sst49lfxxxc.c (Arbeitskopie) @@ -92,6 +92,7 @@ return 0; } +/* real chunksize is 1, logical chunksize is page_size */ int write_49lfxxxc(struct flashchip *flash, uint8_t *buf) { int i; @@ -100,21 +101,10 @@ chipaddr bios = flash->virtual_memory; write_lockbits_49lfxxxc(flash, 0); - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - /* erase the page before programming */ - if (erase_sector_49lfxxxc(flash, i * page_size, flash->page_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - /* 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"); + write_page_82802ab(bios, buf + i * page_size, bios + i * page_size, page_size); } - msg_cinfo("\n"); chip_writeb(0xFF, bios); Index: flashrom-partial_write_no_autoerase/spi.c =================================================================== --- flashrom-partial_write_no_autoerase/spi.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/spi.c (Arbeitskopie) @@ -67,7 +67,7 @@ .command = sb600_spi_send_command, .multicommand = default_spi_send_multicommand, .read = sb600_spi_read, - .write_256 = sb600_spi_write_1, + .write_256 = sb600_spi_write_256, }, { /* SPI_CONTROLLER_VIA */ @@ -194,6 +194,7 @@ * Program chip using page (256 bytes) programming. * Some SPI masters can't do this, they use single byte programming instead. */ +/* real chunksize is up to 256, logical chunksize is 256 */ int spi_chip_write_256(struct flashchip *flash, uint8_t *buf) { if (!spi_programmer[spi_controller].write_256) { Index: flashrom-partial_write_no_autoerase/ft2232_spi.c =================================================================== --- flashrom-partial_write_no_autoerase/ft2232_spi.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/ft2232_spi.c (Arbeitskopie) @@ -287,18 +287,8 @@ int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf) { - int total_size = 1024 * flash->total_size; - spi_disable_blockprotect(); - /* Erase first. */ - msg_pinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_perr("ERASE FAILED!\n"); - return -1; - } - msg_pinfo("done.\n"); - msg_pdbg("total_size is %d\n", total_size); - return spi_write_chunked(flash, buf, 0, total_size, 256); + return spi_write_chunked(flash, buf, 0, flash->total_size * 1024, 256); } #endif Index: flashrom-partial_write_no_autoerase/sst28sf040.c =================================================================== --- flashrom-partial_write_no_autoerase/sst28sf040.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/sst28sf040.c (Arbeitskopie) @@ -111,6 +111,7 @@ return 0; } +/* real chunksize is 1, logical chunksize is page_size */ int write_28sf040(struct flashchip *flash, uint8_t *buf) { int i; @@ -120,21 +121,9 @@ unprotect_28sf040(bios); - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - /* erase the page before programming */ - if (erase_sector_28sf040(flash, i * page_size, page_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - - /* 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"); + write_sector_28sf040(bios, buf + i * page_size, bios + i * page_size, page_size); } - msg_cinfo("\n"); protect_28sf040(bios); Index: flashrom-partial_write_no_autoerase/sb600spi.c =================================================================== --- flashrom-partial_write_no_autoerase/sb600spi.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/sb600spi.c (Arbeitskopie) @@ -47,25 +47,10 @@ return spi_read_chunked(flash, buf, start, len, 8); } -/* FIXME: SB600 can write 5 bytes per transaction. */ -int sb600_spi_write_1(struct flashchip *flash, uint8_t *buf) +int sb600_spi_write_256(struct flashchip *flash, uint8_t *buf) { - int total_size = flash->total_size * 1024; - int result = 0; - spi_disable_blockprotect(); - /* Erase first */ - msg_pinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_perr("ERASE FAILED!\n"); - return -1; - } - msg_pinfo("done.\n"); - - msg_pinfo("Programming flash"); - result = spi_write_chunked(flash, buf, 0, total_size, 5); - msg_pinfo(" done.\n"); - return result; + return spi_write_chunked(flash, buf, 0, flash->total_size * 1024, 5); } static void reset_internal_fifo_pointer(void) Index: flashrom-partial_write_no_autoerase/flashrom.c =================================================================== --- flashrom-partial_write_no_autoerase/flashrom.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/flashrom.c (Arbeitskopie) @@ -1319,6 +1319,7 @@ /* This function signature is horrible. We need to design a better interface, * but right now it allows us to split off the CLI code. + * Besides that, the function itself is a textbook example of abysmal code flow. */ int doit(struct flashchip *flash, int force, char *filename, int read_it, int write_it, int erase_it, int verify_it) { @@ -1358,12 +1359,7 @@ programmer_shutdown(); return 1; } - } else { - struct stat image_stat; - - if (flash->unlock) - flash->unlock(flash); - + } else if (write_it) { if (flash->tested & TEST_BAD_ERASE) { msg_cerr("Erase is not working on this chip " "and erase is needed for write. "); @@ -1385,6 +1381,18 @@ msg_cerr("Continuing anyway.\n"); } } + if (!flash->write) { + msg_cerr("Error: flashrom has no write function for this flash chip.\n"); + programmer_shutdown(); + return 1; + } + if (flash->unlock) + flash->unlock(flash); + + } + if (write_it || verify_it) { + struct stat image_stat; + if ((image = fopen(filename, "rb")) == NULL) { perror(filename); programmer_shutdown(); @@ -1420,12 +1428,12 @@ // //////////////////////////////////////////////////////////// if (write_it) { - msg_cinfo("Writing flash chip... "); - if (!flash->write) { - msg_cerr("Error: flashrom has no write function for this flash chip.\n"); + if (erase_flash(flash)) { + emergency_help_message(); programmer_shutdown(); return 1; } + msg_cinfo("Writing flash chip... "); ret = flash->write(flash, buf); if (ret) { msg_cerr("FAILED!\n"); Index: flashrom-partial_write_no_autoerase/ichspi.c =================================================================== --- flashrom-partial_write_no_autoerase/ichspi.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/ichspi.c (Arbeitskopie) @@ -646,34 +646,13 @@ int ich_spi_write_256(struct flashchip *flash, uint8_t * buf) { - int i, ret = 0; - int total_size = flash->total_size * 1024; - int erase_size = 64 * 1024; int maxdata = 64; if (spi_controller == SPI_CONTROLLER_VIA) maxdata = 16; spi_disable_blockprotect(); - /* Erase first */ - msg_pinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_perr("ERASE FAILED!\n"); - return -1; - } - msg_pinfo("done.\n"); - - msg_pinfo("Programming page: \n"); - for (i = 0; i < total_size / erase_size; i++) { - ret = spi_write_chunked(flash, buf + (i * erase_size), - i * erase_size, erase_size, maxdata); - if (ret) - break; - } - - msg_pinfo("\n"); - - return ret; + return spi_write_chunked(flash, buf, 0, flash->total_size * 1024, maxdata); } int ich_spi_send_command(unsigned int writecnt, unsigned int readcnt, Index: flashrom-partial_write_no_autoerase/82802ab.c =================================================================== --- flashrom-partial_write_no_autoerase/82802ab.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/82802ab.c (Arbeitskopie) @@ -176,28 +176,16 @@ } } +/* real chunksize is 1, logical chunksize is 1024 */ int write_82802ab(struct flashchip *flash, uint8_t *buf) { int i; chipaddr bios = flash->virtual_memory; - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - - 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-partial_write_no_autoerase/m29f400bt.c =================================================================== --- flashrom-partial_write_no_autoerase/m29f400bt.c (Revision 1005) +++ flashrom-partial_write_no_autoerase/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); @@ -136,6 +133,7 @@ return erase_m29f400bt(flash); } +/* real chunksize is 1, logical chunksize is 8k-64k */ int write_m29f400bt(struct flashchip *flash, uint8_t *buf) { int i; @@ -143,117 +141,27 @@ int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; - //erase_m29f400bt (flash); - 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); - if (block_erase_m29f400bt(flash, i * page_size, page_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - 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"); + write_page_m29f400bt(bios, buf + i * page_size, bios + i * page_size, page_size); } - msg_cinfo("%04d at address: 0x%08x\n", 7, 0x70000); - if (block_erase_m29f400bt(flash, 0x70000, 32 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x70000, bios + 0x70000, 32 * 1024); - - msg_cinfo("%04d at address: 0x%08x\n", 8, 0x78000); - if (block_erase_m29f400bt(flash, 0x78000, 8 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x78000, bios + 0x78000, 8 * 1024); - - msg_cinfo("%04d at address: 0x%08x\n", 9, 0x7a000); - if (block_erase_m29f400bt(flash, 0x7a000, 8 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x7a000, bios + 0x7a000, 8 * 1024); - - msg_cinfo("%04d at address: 0x%08x\n", 10, 0x7c000); - if (block_erase_m29f400bt(flash, 0x7c000, 16 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x7c000, bios + 0x7c000, 16 * 1024); - msg_cinfo("\n"); - return 0; } +/* real chunksize is 1, logical chunksize is 64k */ int write_coreboot_m29f400bt(struct flashchip *flash, uint8_t *buf) { 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("%04d at address: 0x%08x\n", 7, 0x00000); - if (block_erase_m29f400bt(flash, 0x00000, 64 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x00000, bios + 0x00000, 64 * 1024); - - msg_cinfo("%04d at address: 0x%08x\n", 7, 0x10000); - if (block_erase_m29f400bt(flash, 0x10000, 64 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x10000, bios + 0x10000, 64 * 1024); - - msg_cinfo("%04d at address: 0x%08x\n", 7, 0x20000); - if (block_erase_m29f400bt(flash, 0x20000, 64 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x20000, bios + 0x20000, 64 * 1024); - - msg_cinfo("%04d at address: 0x%08x\n", 7, 0x30000); - if (block_erase_m29f400bt(flash, 0x30000, 64 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x30000, bios + 0x30000, 64 * 1024); - msg_cinfo("\n"); - return 0; } -- http://www.hailfinger.org/

3 9

[commit] r1206 - trunk
by repository service 08 Oct '10

08 Oct '10

Author: hailfinger Date: Fri Oct 8 20:52:29 2010 New Revision: 1206 URL: http://flashrom.org/trac/flashrom/changeset/1206 Log: flashrom had an implicit erase-on-write for most flash chip and programmer drivers, but it was not entirely consistent. Some drivers had their own hand-rolled partial update functionality which made handling partial updates from generic code impossible. Move implicit erase out of chip drivers, and kill some dead erase functions at the same time. A full chip erase is now performed in the generic code for all flash chips on write, and after that the whole chip is written. 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/chipdrivers.h trunk/flashchips.c trunk/flashrom.c trunk/jedec.c trunk/m29f400bt.c trunk/sharplhf00l04.c trunk/spi.c trunk/spi25.c trunk/sst28sf040.c trunk/sst49lfxxxc.c trunk/stm50flw0x0x.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/82802ab.c Fri Oct 8 20:52:29 2010 (r1206) @@ -144,23 +144,6 @@ return 0; } -int erase_82802ab(struct flashchip *flash) -{ - int i; - unsigned int total_size = flash->total_size * 1024; - - msg_cspew("total_size is %d; flash->page_size is %d\n", - total_size, flash->page_size); - for (i = 0; i < total_size; i += flash->page_size) - if (erase_block_82802ab(flash, i, flash->page_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - msg_cinfo("DONE ERASE\n"); - - return 0; -} - void write_page_82802ab(chipaddr bios, uint8_t *src, chipaddr dst, int page_size) { @@ -179,11 +162,6 @@ int i; chipaddr bios = flash->virtual_memory; - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - msg_cinfo("Programming at: "); for (i = 0; i < flash->total_size; i++) { if ((i & 0x3) == 0) Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/chipdrivers.h Fri Oct 8 20:52:29 2010 (r1206) @@ -33,8 +33,6 @@ int probe_spi_res2(struct flashchip *flash); int spi_write_enable(void); int spi_write_disable(void); -int spi_chip_erase_60(struct flashchip *flash); -int spi_chip_erase_c7(struct flashchip *flash); int spi_block_erase_20(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_52(struct flashchip *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_d7(struct flashchip *flash, unsigned int addr, unsigned int blocklen); @@ -69,7 +67,6 @@ /* 82802ab.c */ uint8_t wait_82802ab(chipaddr bios); int probe_82802ab(struct flashchip *flash); -int erase_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); @@ -84,7 +81,6 @@ int write_byte_program_jedec(chipaddr bios, uint8_t *src, chipaddr dst); int probe_jedec(struct flashchip *flash); -int erase_chip_jedec(struct flashchip *flash); int write_jedec(struct flashchip *flash, uint8_t *buf); int write_jedec_1(struct flashchip *flash, uint8_t *buf); int erase_sector_jedec(struct flashchip *flash, unsigned int page, unsigned int pagesize); @@ -94,7 +90,6 @@ /* m29f400bt.c */ int probe_m29f400bt(struct flashchip *flash); -int erase_m29f400bt(struct flashchip *flash); int block_erase_m29f400bt(struct flashchip *flash, unsigned int start, unsigned int len); int block_erase_chip_m29f400bt(struct flashchip *flash, unsigned int start, unsigned int len); int write_m29f400bt(struct flashchip *flash, uint8_t *buf); Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/flashchips.c Fri Oct 8 20:52:29 2010 (r1206) @@ -65,7 +65,7 @@ .total_size = 128, .page_size = 16 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, .block_erasers = @@ -231,7 +231,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (am29f040b.c) */ .block_erasers = @@ -477,7 +477,7 @@ .model_id = AMIC_A25L40PT, .total_size = 512, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid4, .probe_timing = TIMING_ZERO, .block_erasers = @@ -509,7 +509,7 @@ .model_id = AMIC_A25L40PU, .total_size = 512, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid4, .probe_timing = TIMING_ZERO, .block_erasers = @@ -541,7 +541,7 @@ .model_id = AMIC_A25L80P, .total_size = 1024, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid4, .probe_timing = TIMING_ZERO, .block_erasers = @@ -608,7 +608,7 @@ .model_id = AMIC_A25L16PU, .total_size = 2048, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid4, .probe_timing = TIMING_ZERO, .block_erasers = @@ -927,7 +927,7 @@ .total_size = 256, .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (mx29f002.c) */ .block_erasers = @@ -984,7 +984,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* routine is wrapper to probe_jedec (pm49fl00x.c) */ .block_erasers = @@ -1196,7 +1196,7 @@ .total_size = 4096, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -1658,7 +1658,7 @@ .total_size = 128, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10000, /* 10mS, Enter=Exec */ .block_erasers = @@ -1885,7 +1885,7 @@ .total_size = 256, .page_size = 256, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -1939,7 +1939,7 @@ .total_size = 256, .page_size = 256, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -2744,7 +2744,7 @@ .total_size = 1024, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -2843,7 +2843,7 @@ .total_size = 128, .page_size = 128, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -2870,7 +2870,7 @@ .total_size = 256, .page_size = 256, .feature_bits = FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -2901,7 +2901,7 @@ .total_size = 256, .page_size = 256, .feature_bits = FEATURE_ADDR_AAA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -3057,7 +3057,7 @@ .total_size = 256, .page_size = 256 * 1024, .feature_bits = FEATURE_EITHER_RESET, /* Some revisions may need FEATURE_ADDR_2AA */ - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -3196,7 +3196,7 @@ .model_id = INTEL_28F002T, .total_size = 256, .page_size = 256 * 1024, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_82802ab, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -3510,7 +3510,7 @@ .total_size = 512, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -3546,7 +3546,7 @@ .total_size = 1024, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -3582,7 +3582,7 @@ .total_size = 2048, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -3684,7 +3684,7 @@ .total_size = 4096, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -3911,7 +3911,7 @@ .total_size = 256, .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (mx29f002.c) */ .block_erasers = @@ -4262,7 +4262,7 @@ .model_id = ST_M25PE80, .total_size = 1024, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -4507,7 +4507,7 @@ .total_size = 256, .page_size = 8 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_FIXME, .block_erasers = @@ -4569,7 +4569,7 @@ .total_size = 128, .page_size = 4096, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -4656,7 +4656,7 @@ .total_size = 256, .page_size = 16 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* routine is wrapper to probe_jedec (pm49fl00x.c) */ .block_erasers = @@ -4686,7 +4686,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* routine is wrapper to probe_jedec (pm49fl00x.c) */ .block_erasers = @@ -4773,7 +4773,7 @@ .model_id = SPANSION_S25FL008A, .total_size = 1024, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -4799,7 +4799,7 @@ .model_id = SPANSION_S25FL016A, .total_size = 2048, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -4825,7 +4825,7 @@ .model_id = SST_SST25VF016B, .total_size = 2048, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -4860,7 +4860,7 @@ .model_id = SST_SST25VF032B, .total_size = 4096, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -4895,7 +4895,7 @@ .model_id = SST_SST25VF064C, .total_size = 8192, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -5058,7 +5058,7 @@ .model_id = SST_SST25VF080B, .total_size = 1024, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -5120,7 +5120,7 @@ .total_size = 128, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -5166,7 +5166,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -5189,7 +5189,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -5238,7 +5238,7 @@ .total_size = 128, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5264,7 +5264,7 @@ .total_size = 256, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5290,7 +5290,7 @@ .total_size = 512, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5316,7 +5316,7 @@ .total_size = 64, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5342,7 +5342,7 @@ .total_size = 128, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5449,7 +5449,7 @@ .total_size = 256, .page_size = 16 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5514,7 +5514,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5577,7 +5577,7 @@ .total_size = 1024, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5640,7 +5640,7 @@ .total_size = 2048, .page_size = 4 * 1024, .feature_bits = FEATURE_REGISTERMAP, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_82802ab, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (sst49lfxxxc.c) */ .block_erasers = @@ -5672,7 +5672,7 @@ .total_size = 256, .page_size = 16 * 1024, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5701,7 +5701,7 @@ .total_size = 256, .page_size = 4 * 1024, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5730,7 +5730,7 @@ .total_size = 512, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -5759,7 +5759,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET | FEATURE_REGISTERMAP, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 1, /* 150ns */ .block_erasers = @@ -5789,7 +5789,7 @@ .total_size = 1024, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_FIXME, .block_erasers = @@ -5818,7 +5818,7 @@ .total_size = 2048, .page_size = 4 * 1024, .feature_bits = FEATURE_REGISTERMAP, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_82802ab, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (sst49lfxxxc.c) */ .block_erasers = @@ -5906,7 +5906,7 @@ .model_id = ST_M25P10A, .total_size = 128, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -5985,7 +5985,7 @@ .model_id = ST_M25P40, .total_size = 512, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -6037,7 +6037,7 @@ .model_id = ST_M25P80, .total_size = 1024, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -6063,7 +6063,7 @@ .model_id = ST_M25P16, .total_size = 2048, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -6089,7 +6089,7 @@ .model_id = ST_M25P32, .total_size = 4096, .page_size = 256, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -6167,7 +6167,7 @@ .model_id = ST_M25PX32, .total_size = 4096, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -6196,7 +6196,7 @@ .model_id = ST_M25PX64, .total_size = 8192, .page_size = 256, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -6429,7 +6429,7 @@ .total_size = 64, .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, .block_erasers = @@ -6522,7 +6522,7 @@ .total_size = 1024, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_82802ab, .probe_timing = TIMING_FIXME, .block_erasers = @@ -6816,7 +6816,7 @@ .total_size = 256, .page_size = 512, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .block_erasers = @@ -7008,7 +7008,7 @@ .total_size = 1024, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -7080,7 +7080,7 @@ .total_size = 4096, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -7116,7 +7116,7 @@ .total_size = 8192, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -7212,7 +7212,7 @@ .total_size = 512, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -7242,7 +7242,7 @@ .total_size = 1024, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -7272,7 +7272,7 @@ .total_size = 2048, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -7380,7 +7380,7 @@ .total_size = 128, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = 10, /* used datasheet for the W29C011A */ .block_erasers = @@ -7403,7 +7403,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -7449,7 +7449,7 @@ .total_size = 128, .page_size = 128, .feature_bits = FEATURE_LONG_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_w29ee011, .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (w29ee011.c) */ .block_erasers = @@ -7472,7 +7472,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -7498,7 +7498,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -7551,7 +7551,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -7608,7 +7608,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -7662,7 +7662,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -7693,7 +7693,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PRW, + .tested = TEST_OK_PR, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -7724,7 +7724,7 @@ .total_size = 1024, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PREW, + .tested = TEST_OK_PRE, .probe = probe_jedec, .probe_timing = TIMING_FIXME, .block_erasers = Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/flashrom.c Fri Oct 8 20:52:29 2010 (r1206) @@ -1509,6 +1509,7 @@ /* This function signature is horrible. We need to design a better interface, * but right now it allows us to split off the CLI code. + * Besides that, the function itself is a textbook example of abysmal code flow. */ int doit(struct flashchip *flash, int force, char *filename, int read_it, int write_it, int erase_it, int verify_it) { @@ -1563,12 +1564,7 @@ programmer_shutdown(); return 1; } - } else { - struct stat image_stat; - - if (flash->unlock) - flash->unlock(flash); - + } else if (write_it) { if (flash->tested & TEST_BAD_ERASE) { msg_cerr("Erase is not working on this chip " "and erase is needed for write. "); @@ -1590,6 +1586,18 @@ msg_cerr("Continuing anyway.\n"); } } + if (!flash->write) { + msg_cerr("Error: flashrom has no write function for this flash chip.\n"); + programmer_shutdown(); + return 1; + } + if (flash->unlock) + flash->unlock(flash); + + } + if (write_it || verify_it) { + struct stat image_stat; + if ((image = fopen(filename, "rb")) == NULL) { perror(filename); programmer_shutdown(); @@ -1625,12 +1633,12 @@ // //////////////////////////////////////////////////////////// if (write_it) { - msg_cinfo("Writing flash chip... "); - if (!flash->write) { - msg_cerr("Error: flashrom has no write function for this flash chip.\n"); + if (erase_flash(flash)) { + emergency_help_message(); programmer_shutdown(); return 1; } + msg_cinfo("Writing flash chip... "); ret = flash->write(flash, buf); if (ret) { msg_cerr("FAILED!\n"); Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/jedec.c Fri Oct 8 20:52:29 2010 (r1206) @@ -402,11 +402,6 @@ mask = getaddrmask(flash); - if (erase_chip_jedec(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { msg_cinfo("%04d at address: 0x%08x", i, i * page_size); @@ -429,12 +424,6 @@ mask = getaddrmask(flash); - programmer_delay(10); - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - msg_cinfo("Programming page: "); for (i = 0; i < flash->total_size; i++) { if ((i & 0x3) == 0) Modified: trunk/m29f400bt.c ============================================================================== --- trunk/m29f400bt.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/m29f400bt.c Fri Oct 8 20:52:29 2010 (r1206) @@ -143,7 +143,6 @@ int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; - //erase_m29f400bt (flash); msg_cinfo("Programming page:\n "); /********************************* *Pages for M29F400BT: @@ -163,41 +162,21 @@ 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); - if (block_erase_m29f400bt(flash, i * page_size, page_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } 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); - if (block_erase_m29f400bt(flash, 0x70000, 32 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x70000, bios + 0x70000, 32 * 1024); msg_cinfo("%04d at address: 0x%08x\n", 8, 0x78000); - if (block_erase_m29f400bt(flash, 0x78000, 8 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x78000, bios + 0x78000, 8 * 1024); msg_cinfo("%04d at address: 0x%08x\n", 9, 0x7a000); - if (block_erase_m29f400bt(flash, 0x7a000, 8 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x7a000, bios + 0x7a000, 8 * 1024); msg_cinfo("%04d at address: 0x%08x\n", 10, 0x7c000); - if (block_erase_m29f400bt(flash, 0x7c000, 16 * 1024)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } write_page_m29f400bt(bios, buf + 0x7c000, bios + 0x7c000, 16 * 1024); msg_cinfo("\n"); Modified: trunk/sharplhf00l04.c ============================================================================== --- trunk/sharplhf00l04.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/sharplhf00l04.c Fri Oct 8 20:52:29 2010 (r1206) @@ -65,10 +65,6 @@ int page_size = flash->page_size; chipaddr bios = flash->virtual_memory; - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { msg_cinfo("%04d at address: 0x%08x", i, i * page_size); Modified: trunk/spi.c ============================================================================== --- trunk/spi.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/spi.c Fri Oct 8 20:52:29 2010 (r1206) @@ -262,12 +262,6 @@ { int ret; - msg_pinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_perr("ERASE FAILED!\n"); - return -1; - } - msg_pinfo("done.\n"); msg_pinfo("Programming flash... "); ret = spi_chip_write_256_new(flash, buf, 0, flash->total_size * 1024); if (!ret) Modified: trunk/spi25.c ============================================================================== --- trunk/spi25.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/spi25.c Fri Oct 8 20:52:29 2010 (r1206) @@ -1321,14 +1321,6 @@ int spi_chip_write_1(struct flashchip *flash, uint8_t *buf) { - /* Erase first */ - msg_cinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - msg_cinfo("done.\n"); - return spi_chip_write_1_new(flash, buf, 0, flash->total_size * 1024); } @@ -1426,14 +1418,6 @@ int spi_aai_write(struct flashchip *flash, uint8_t *buf) { - /* Erase first */ - msg_cinfo("Erasing flash before programming... "); - if (erase_flash(flash)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - msg_cinfo("done.\n"); - return spi_aai_write_new(flash, buf, 0, flash->total_size * 1024); } Modified: trunk/sst28sf040.c ============================================================================== --- trunk/sst28sf040.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/sst28sf040.c Fri Oct 8 20:52:29 2010 (r1206) @@ -122,12 +122,6 @@ msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - /* erase the page before programming */ - if (erase_sector_28sf040(flash, i * page_size, page_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } - /* write to the sector */ msg_cinfo("%04d at address: 0x%08x", i, i * page_size); write_sector_28sf040(bios, buf + i * page_size, Modified: trunk/sst49lfxxxc.c ============================================================================== --- trunk/sst49lfxxxc.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/sst49lfxxxc.c Fri Oct 8 20:52:29 2010 (r1206) @@ -86,11 +86,6 @@ write_lockbits_49lfxxxc(flash, 0); msg_cinfo("Programming page: "); for (i = 0; i < total_size / page_size; i++) { - /* erase the page before programming */ - if (erase_sector_49lfxxxc(flash, i * page_size, flash->page_size)) { - msg_cerr("ERASE FAILED!\n"); - return -1; - } /* write to the sector */ msg_cinfo("%04d at address: 0x%08x", i, i * page_size); Modified: trunk/stm50flw0x0x.c ============================================================================== --- trunk/stm50flw0x0x.c Fri Oct 8 18:37:10 2010 (r1205) +++ trunk/stm50flw0x0x.c Fri Oct 8 20:52:29 2010 (r1206) @@ -93,6 +93,7 @@ return 0; } +/* This function is unused. */ int erase_sector_stm50flw0x0x(struct flashchip *flash, unsigned int sector, unsigned int sectorsize) { chipaddr bios = flash->virtual_memory + sector; @@ -116,6 +117,7 @@ return 0; } +/* FIXME: This function is not a real chip erase function. */ int erase_chip_stm50flw0x0x(struct flashchip *flash, unsigned int addr, unsigned int blocklen) { int i;

1 0

[PATCH] flashrom 0.9.3
by Carl-Daniel Hailfinger 08 Oct '10

08 Oct '10

Increase flashrom release number to 0.9.3. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-0.9.3/Makefile =================================================================== --- flashrom-0.9.3/Makefile (Revision 1199) +++ flashrom-0.9.3/Makefile (Arbeitskopie) @@ -100,7 +100,7 @@ # will not require subversion. The downloadable snapshots are already exported. SVNVERSION := $(shell LC_ALL=C svnversion -cn . 2>/dev/null | sed -e "s/.*://" -e "s/$[0-9]*$.*/\1/" | grep "[0-9]" || LC_ALL=C svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || LC_ALL=C git svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || echo unknown) -RELEASE := 0.9.2 +RELEASE := 0.9.3 VERSION := $(RELEASE)-r$(SVNVERSION) RELEASENAME ?= $(VERSION) -- http://www.hailfinger.org/

2 2

[commit] r1205 - tags/flashrom-0.9.3
by repository service 08 Oct '10

08 Oct '10

Author: hailfinger Date: Fri Oct 8 18:37:10 2010 New Revision: 1205 URL: http://flashrom.org/trac/flashrom/changeset/1205 Log: Tag flashrom 0.9.3 Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Added: tags/flashrom-0.9.3/ - copied from r1204, trunk/

1 0

[commit] r1204 - trunk
by repository service 08 Oct '10

08 Oct '10

Author: hailfinger Date: Fri Oct 8 18:31:43 2010 New Revision: 1204 URL: http://flashrom.org/trac/flashrom/changeset/1204 Log: Increase flashrom release number to 0.9.3. 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/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Fri Oct 8 14:40:09 2010 (r1203) +++ trunk/Makefile Fri Oct 8 18:31:43 2010 (r1204) @@ -100,7 +100,7 @@ # will not require subversion. The downloadable snapshots are already exported. SVNVERSION := $(shell LC_ALL=C svnversion -cn . 2>/dev/null | sed -e "s/.*://" -e "s/$[0-9]*$.*/\1/" | grep "[0-9]" || LC_ALL=C svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || LC_ALL=C git svn info . 2>/dev/null | awk '/^Revision:/ {print $$2 }' | grep "[0-9]" || echo unknown) -RELEASE := 0.9.2 +RELEASE := 0.9.3 VERSION := $(RELEASE)-r$(SVNVERSION) RELEASENAME ?= $(VERSION)

1 0

Re: [flashrom] [coreboot] Fwd: Dogbert's Blog: BIOS Password Backdoors in Laptops
by Carl-Daniel Hailfinger 08 Oct '10

08 Oct '10

On 08.10.2010 05:07, ron minnich wrote: > Kinda fun. > > ---------- Forwarded message ---------- > > Date: Thu, Oct 7, 2010 at 11:25 AM > Subject: Dogbert's Blog: BIOS Password Backdoors in Laptops > To: ron minnich <rminnich(a)gmail.com> > > > Amusing, and potentially useful, too. > > http://dogber1.blogspot.com/2009/05/table-of-reverse-engineered-bios.html > Ooh nice! I really need to write a short tutorial on how to do password recovery with flashrom if you can still boot the machine (i.e. only a BIOS setting screen password) or if you can open the machine and access the flash chip. Regards, Carl-Daniel -- http://www.hailfinger.org/

1 0

[PATCH] Compile fixes, update README
by Carl-Daniel Hailfinger 08 Oct '10

08 Oct '10

I wanted to tag 0.9.3, but then I noticed that compilation was broken in a few cases, and the README had insufficient information. Fix that. In detail: CONFIG_BITBANG_SPI was not selected if CONFIG_NICINTEL_SPI was on by default. Wiki output was missing all flash chips if CONFIG_INTERNAL was not selected. ft2232_spi used possibly negative indices in the toupper() function/array. Software requirements on non-Linux/FreeBSD/OpenBSD operating systems were missing. Non-x86 compilation does not work with the default programmer set, so list the make parameters which result in a working build. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-compilefixes/Makefile =================================================================== --- flashrom-compilefixes/Makefile (revision 1201) +++ flashrom-compilefixes/Makefile (working copy) @@ -115,21 +115,6 @@ # RayeR SPIPGM hardware support CONFIG_RAYER_SPI ?= yes -# Bitbanging SPI infrastructure, default off unless needed. -ifeq ($(CONFIG_RAYER_SPI), yes) -override CONFIG_BITBANG_SPI = yes -else -ifeq ($(CONFIG_INTERNAL), yes) -override CONFIG_BITBANG_SPI = yes -else -ifeq ($(CONFIG_NICINTEL_SPI), yes) -override CONFIG_BITBANG_SPI = yes -else -CONFIG_BITBANG_SPI ?= no -endif -endif -endif - # Always enable 3Com NICs for now. CONFIG_NIC3COM ?= yes @@ -170,7 +155,22 @@ # Disable wiki printing by default. It is only useful if you have wiki access. CONFIG_PRINT_WIKI ?= no +# Bitbanging SPI infrastructure, default off unless needed. +ifeq ($(CONFIG_RAYER_SPI), yes) +override CONFIG_BITBANG_SPI = yes +else ifeq ($(CONFIG_INTERNAL), yes) +override CONFIG_BITBANG_SPI = yes +else +ifeq ($(CONFIG_NICINTEL_SPI), yes) +override CONFIG_BITBANG_SPI = yes +else +CONFIG_BITBANG_SPI ?= no +endif +endif +endif + +ifeq ($(CONFIG_INTERNAL), yes) FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1' PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o dmi.o internal.o # FIXME: The PROGRAMMER_OBJS below should only be included on x86. Index: flashrom-compilefixes/print_wiki.c =================================================================== --- flashrom-compilefixes/print_wiki.c (revision 1201) +++ flashrom-compilefixes/print_wiki.c (working copy) @@ -268,8 +268,8 @@ time_t t = time(NULL); printf(wiki_header, ctime(&t), flashrom_version); + print_supported_chips_wiki(2); #if CONFIG_INTERNAL == 1 - print_supported_chips_wiki(2); print_supported_chipsets_wiki(3); print_supported_boards_wiki(); #endif Index: flashrom-compilefixes/ft2232_spi.c =================================================================== --- flashrom-compilefixes/ft2232_spi.c (revision 1201) +++ flashrom-compilefixes/ft2232_spi.c (working copy) @@ -148,7 +148,7 @@ free(arg); arg = extract_programmer_param("port"); if (arg) { - switch (toupper(*arg)) { + switch (toupper((unsigned char)*arg)) { case 'A': ft2232_interface = INTERFACE_A; break; Index: flashrom-compilefixes/README =================================================================== --- flashrom-compilefixes/README (revision 1201) +++ flashrom-compilefixes/README (working copy) @@ -60,6 +60,11 @@ * devel/gmake * sysutils/pciutils +On other operating systems, you need the following software: + + * pciutils+libpci (if you want support for mainboard or PCI device flashing) + * libusb (if you want FT2232 or Dediprog support) + To compile on Linux, use: make @@ -111,6 +116,18 @@ http://homer.rice.edu/~sandmann/cwsdpmi/csdpmi7b.zip and make sure CWSDPMI.EXE is in the current directory. +Processor architecture dependent features: + + On non-x86 architectures you have to disable a few programmers because they + use port-based I/O which is not directly available on non-x86. Please add + CONFIG_RAYER_SPI=no CONFIG_NIC3COM=no CONFIG_ATAHPT=no CONFIG_NICREALTEK=no \ + CONFIG_NICNATSEMI=no + as parameters to the "make" invocation. + Besides that, the internal programmer is only supported on x86 and MIPS. On + other architectures, please add + CONFIG_INTERNAL=no + as parameter to the "make" invocation. + Installation ------------ -- http://www.hailfinger.org/

2 3

[commit] r1203 - trunk
by repository service 08 Oct '10

08 Oct '10

Author: hailfinger Date: Fri Oct 8 14:40:09 2010 New Revision: 1203 URL: http://flashrom.org/trac/flashrom/changeset/1203 Log: CONFIG_BITBANG_SPI was not selected if CONFIG_NICINTEL_SPI was on by default. Wiki output was missing all flash chips if CONFIG_INTERNAL was not selected. Use correct type for toupper()/tolower()/isspace() functions. Specify software requirements in a generic way. Non-x86 compilation does not work with the default programmer set, so list the make parameters which result in a working build. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Modified: trunk/Makefile trunk/README trunk/ft2232_spi.c trunk/print_wiki.c trunk/processor_enable.c trunk/serial.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Fri Oct 8 13:03:02 2010 (r1202) +++ trunk/Makefile Fri Oct 8 14:40:09 2010 (r1203) @@ -115,21 +115,6 @@ # RayeR SPIPGM hardware support CONFIG_RAYER_SPI ?= yes -# Bitbanging SPI infrastructure, default off unless needed. -ifeq ($(CONFIG_RAYER_SPI), yes) -override CONFIG_BITBANG_SPI = yes -else -ifeq ($(CONFIG_INTERNAL), yes) -override CONFIG_BITBANG_SPI = yes -else -ifeq ($(CONFIG_NICINTEL_SPI), yes) -override CONFIG_BITBANG_SPI = yes -else -CONFIG_BITBANG_SPI ?= no -endif -endif -endif - # Always enable 3Com NICs for now. CONFIG_NIC3COM ?= yes @@ -170,6 +155,21 @@ # Disable wiki printing by default. It is only useful if you have wiki access. CONFIG_PRINT_WIKI ?= no +# Bitbanging SPI infrastructure, default off unless needed. +ifeq ($(CONFIG_RAYER_SPI), yes) +override CONFIG_BITBANG_SPI = yes +else +ifeq ($(CONFIG_INTERNAL), yes) +override CONFIG_BITBANG_SPI = yes +else +ifeq ($(CONFIG_NICINTEL_SPI), yes) +override CONFIG_BITBANG_SPI = yes +else +CONFIG_BITBANG_SPI ?= no +endif +endif +endif + ifeq ($(CONFIG_INTERNAL), yes) FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1' PROGRAMMER_OBJS += processor_enable.o chipset_enable.o board_enable.o cbtable.o dmi.o internal.o Modified: trunk/README ============================================================================== --- trunk/README Fri Oct 8 13:03:02 2010 (r1202) +++ trunk/README Fri Oct 8 14:40:09 2010 (r1203) @@ -42,7 +42,11 @@ Build Instructions ------------------ -To build flashrom you need to install the following packages or ports: +To build flashrom you need to install the following software: + + * pciutils+libpci (if you want support for mainboard or PCI device flashing) + * libusb (if you want FT2232 or Dediprog support) + * libftdi (if you want FT2232 support) Linux et al: @@ -111,6 +115,18 @@ http://homer.rice.edu/~sandmann/cwsdpmi/csdpmi7b.zip and make sure CWSDPMI.EXE is in the current directory. +Processor architecture dependent features: + + On non-x86 architectures you have to disable a few programmers because they + use port-based I/O which is not directly available on non-x86. Please add + CONFIG_RAYER_SPI=no CONFIG_NIC3COM=no CONFIG_ATAHPT=no CONFIG_NICREALTEK=no \ + CONFIG_NICNATSEMI=no + as parameters to the "make" invocation. + Besides that, the internal programmer is only supported on x86 and MIPS. On + other architectures, please add + CONFIG_INTERNAL=no + as parameter to the "make" invocation. + Installation ------------ Modified: trunk/ft2232_spi.c ============================================================================== --- trunk/ft2232_spi.c Fri Oct 8 13:03:02 2010 (r1202) +++ trunk/ft2232_spi.c Fri Oct 8 14:40:09 2010 (r1203) @@ -148,7 +148,7 @@ free(arg); arg = extract_programmer_param("port"); if (arg) { - switch (toupper(*arg)) { + switch (toupper((unsigned char)*arg)) { case 'A': ft2232_interface = INTERFACE_A; break; Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Fri Oct 8 13:03:02 2010 (r1202) +++ trunk/print_wiki.c Fri Oct 8 14:40:09 2010 (r1203) @@ -268,8 +268,8 @@ time_t t = time(NULL); printf(wiki_header, ctime(&t), flashrom_version); -#if CONFIG_INTERNAL == 1 print_supported_chips_wiki(2); +#if CONFIG_INTERNAL == 1 print_supported_chipsets_wiki(3); print_supported_boards_wiki(); #endif Modified: trunk/processor_enable.c ============================================================================== --- trunk/processor_enable.c Fri Oct 8 13:03:02 2010 (r1202) +++ trunk/processor_enable.c Fri Oct 8 14:40:09 2010 (r1203) @@ -53,22 +53,22 @@ if (fgets(line, sizeof(line), cpuinfo) == NULL) break; ptr = line; - while (*ptr && isspace(*ptr)) + while (*ptr && isspace((unsigned char)*ptr)) ptr++; /* "cpu" part appears only with some Linux versions. */ if (strncmp(ptr, "cpu", sizeof("cpu") - 1) == 0) ptr += sizeof("cpu") - 1; - while (*ptr && isspace(*ptr)) + while (*ptr && isspace((unsigned char)*ptr)) ptr++; if (strncmp(ptr, "model", sizeof("model") - 1) != 0) continue; ptr += sizeof("model") - 1; - while (*ptr && isspace(*ptr)) + while (*ptr && isspace((unsigned char)*ptr)) ptr++; if (*ptr != ':') continue; ptr++; - while (*ptr && isspace(*ptr)) + while (*ptr && isspace((unsigned char)*ptr)) ptr++; fclose(cpuinfo); return (strncmp(ptr, "ICT Loongson-2 V0.3", Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Fri Oct 8 13:03:02 2010 (r1202) +++ trunk/serial.c Fri Oct 8 14:40:09 2010 (r1203) @@ -106,8 +106,9 @@ #ifdef _WIN32 HANDLE fd; char *dev2 = dev; - if ((strlen(dev) > 3) && (tolower(dev[0]) == 'c') - && (tolower(dev[1]) == 'o') && (tolower(dev[2]) == 'm')) { + if ((strlen(dev) > 3) && (tolower((unsigned char)dev[0]) == 'c') && + (tolower((unsigned char)dev[1]) == 'o') && + (tolower((unsigned char)dev[2]) == 'm')) { dev2 = malloc(strlen(dev) + 5); strcpy(dev2, "\\\\.\\"); strcpy(dev2 + 4, dev);

1 0

[PATCH] Note to add the board/device name to the subject when contacting the ML.
by Paul Menzel 08 Oct '10

08 Oct '10

A lot of messages sent to flashrom(a)flashrom.org just have »flashrom -V« as the subject rendering it in my opinion unusable. Adding the board/device name to the subject would help a lot when skimming over the messages by the subject line or searching the messages just using the subject line. • I did not add that note to outputs saying to report a bug to the mailing list. • I do not know if the subject line can be created automatically in those message, so users just have to copy and paste them. • I am not a native speaker, so I do not know if using plain »subject« instead of »subject line« would be enough and if the propositions I used are correct. Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- board_enable.c | 7 +++++-- chipset_enable.c | 7 +++++-- flashrom.c | 5 +++-- pcidev.c | 3 ++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/board_enable.c b/board_enable.c index ae0fbfa..52052d3 100644 --- a/board_enable.c +++ b/board_enable.c @@ -430,7 +430,9 @@ int it8705f_write_enable(uint8_t port) max_rom_decode.parallel = 1024 * 1024; msg_pinfo("IT8705F with very unusual settings. Please " "send the output of \"flashrom -V\" to \n" - "flashrom(a)flashrom.org to help us finish " + "flashrom(a)flashrom.org with \n\n" + "IT8705: your board name: flashrom -V \n\n" + "as the subject to help us finish " "support for your Super I/O. Thanks.\n"); ret = 1; } else if (tmp & 0x08) { @@ -1964,7 +1966,8 @@ int board_flash_enable(const char *vendor, const char *part) board = NULL; } else { msg_pinfo("NOTE: Running an untested board enable procedure.\n" - "Please report success/failure to flashrom(a)flashrom.org.\n"); + "Please report success/failure to flashrom(a)flashrom.org \n" + "with your board name and SUCCESS or FAILURE in the subject.\n"); } } diff --git a/chipset_enable.c b/chipset_enable.c index f191061..4549e52 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -923,7 +923,9 @@ static int enable_flash_mcp6x_7x(struct pci_dev *dev, const char *name) } out_msg: msg_pinfo("Please send the output of \"flashrom -V\" to " - "flashrom(a)flashrom.org to help us finish support for your " + "flashrom(a)flashrom.org with \n\n" + "your board name: flashrom -V \n\n" + "as the subject to help us finish support for your " "chipset. Thanks.\n"); return ret; @@ -1178,7 +1180,8 @@ int chipset_flash_enable(void) if (ret != -2) { msg_pinfo("WARNING: unexpected second chipset match: " "\"%s %s\"\nignoring, please report lspci and " - "board URL to flashrom(a)flashrom.org!\n", + "board URL to flashrom(a)flashrom.org " + "with your board name in the subject line!\n", chipset_enables[i].vendor_name, chipset_enables[i].device_name); continue; diff --git a/flashrom.c b/flashrom.c index 45d086d..9dd1c48 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1290,7 +1290,7 @@ void emergency_help_message(void) { msg_gerr("Your flash chip is in an unknown state.\n" "Get help on IRC at irc.freenode.net (channel #flashrom) or\n" - "mail flashrom(a)flashrom.org!\n" + "mail flashrom(a)flashrom.org with your board name in the subject line!\n" "-------------------------------------------------------------" "------------------\n" "DO NOT REBOOT OR POWEROFF!\n"); @@ -1430,7 +1430,8 @@ void check_chip_supported(struct flashchip *flash) "output with the additional -V option for all " "operations you tested (-V, -Vr,\n" "-Vw, -VE), and mention which mainboard or " - "programmer you tested.\n" + "programmer you tested. Please mention your board in " + "the subject line.\n" "Thanks for your help!\n" "===\n"); } diff --git a/pcidev.c b/pcidev.c index f7048e7..decf4e7 100644 --- a/pcidev.c +++ b/pcidev.c @@ -69,7 +69,8 @@ uint32_t pcidev_validate(struct pci_dev *dev, uint32_t bar, msg_pinfo("===\nThis PCI device is UNTESTED. Please " "report the 'flashrom -p xxxx' output \n" "to flashrom(a)flashrom.org if it works " - "for you. Thank you for your help!\n===\n"); + "for you. Please add the name of your PCI device " + "to the subject. Thank you for your help!\n===\n"); } return addr; -- 1.7.1

2 1

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom October 2010