openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 14:11:15 +02:00
Code Issues Releases Wiki Activity

Replace remaining explicit erases in SPI programmer drivers with auto-erases

Browse Source 
Some SPI chip drivers and the generic 1-byte SPI chip write functions
didn't include the automatic erase present in other chip drivers.

Since the majority is definitely auto-erase, change the remaining
explicit-erase cases to be auto-erase as well.

Corresponding to flashrom svn r673.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Carlos Arnau Perez <cemede@gmail.com>
This commit is contained in:
Carl-Daniel Hailfinger
2009-08-10 02:29:21 +00:00
parent db41c59e3b
commit 116081a224
6 changed files with 30 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
it87spi.c
View File

@ -247,32 +247,6 @@ static int it8716f_spi_page_program(struct flashchip *flash, int block, uint8_t
return 0;
}
/*
* Program chip using firmware cycle byte programming. (SLOW!)
* This is for chips which can only handle one byte writes
* and for chips where memory mapped programming is impossible due to
* size constraints in IT87* (over 512 kB)
*/
int it8716f_spi_chip_write_1(struct flashchip *flash, uint8_t *buf)
{
int total_size = 1024 * flash->total_size;
int i;
int result;
fast_spi = 0;
spi_disable_blockprotect();
for (i = 0; i < total_size; i++) {
result = spi_byte_program(i, buf[i]);
while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP)
programmer_delay(10);
}
/* resume normal ops... */
OUTB(0x20, it8716f_flashport);
return 0;
}
/*
* IT8716F only allows maximum of 512 kb SPI mapped to LPC memory cycles
* Need to read this big flash using firmware cycles 3 byte at a time.
@ -301,8 +275,16 @@ int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf)
* mapped access.
*/
if ((programmer == PROGRAMMER_IT87SPI) || (total_size > 512 * 1024)) {
it8716f_spi_chip_write_1(flash, buf);
spi_chip_write_1(flash, buf);
} else {
spi_disable_blockprotect();
/* Erase first */
printf("Erasing flash before programming... ");
if (flash->erase(flash)) {
fprintf(stderr, "ERASE FAILED!\n");
return -1;
}
printf("done.\n");
for (i = 0; i < total_size / 256; i++) {
it8716f_spi_page_program(flash, i, buf);
}