openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 06:01:16 +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

20
wbsio_spi.c
View File

@ -183,29 +183,17 @@ int wbsio_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len)
return 1;
}
read_memmapped(flash, buf, start, len);
return 0;
return read_memmapped(flash, buf, start, len);
}
int wbsio_spi_write_1(struct flashchip *flash, uint8_t *buf)
{
int pos, size = flash->total_size * 1024;
int result;
int size = flash->total_size * 1024;
if (flash->total_size > 1024) {
if (size > 1024 * 1024) {
fprintf(stderr, "%s: Winbond saved on 4 register bits so max chip size is 1024 KB!\n", __func__);
return 1;
}
if (flash->erase(flash)) {
fprintf(stderr, "ERASE FAILED!\n");
return -1;
}
for (pos = 0; pos < size; pos++) {
result = spi_byte_program(pos, buf[pos]);
while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP)
programmer_delay(10);
}
spi_write_disable();
return 0;
return spi_chip_write_1(flash, buf);
}