mirror of
https://review.coreboot.org/flashrom.git
synced 2025-07-02 22:43:17 +02:00
Every SPI host controller implemented its own way to read flash chips
This was partly due to a design problem in the abstraction layer. There should be exactly two different functions for reading SPI chips: - memory mapped reads - SPI command reads. Each of them should be contained in a separate function, optionally taking parameters where needed. This patch solves the problems mentioned above, shortens the code and makes the code logic a lot more obvious. Since open-coding the min() function leads to errors, include it in this patch as well. Corresponding to flashrom svn r589. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
10
it87spi.c
10
it87spi.c
@ -260,18 +260,12 @@ int it8716f_spi_chip_write_1(struct flashchip *flash, uint8_t *buf)
|
||||
int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf)
|
||||
{
|
||||
int total_size = 1024 * flash->total_size;
|
||||
int i;
|
||||
fast_spi = 0;
|
||||
|
||||
if ((programmer == PROGRAMMER_IT87SPI) || (total_size > 512 * 1024)) {
|
||||
for (i = 0; i < total_size; i += 3) {
|
||||
int toread = 3;
|
||||
if (total_size - i < toread)
|
||||
toread = total_size - i;
|
||||
spi_nbyte_read(i, buf + i, toread);
|
||||
}
|
||||
spi_read_chunked(flash, buf, 3);
|
||||
} else {
|
||||
memcpy(buf, (const char *)flash->virtual_memory, total_size);
|
||||
read_memmapped(flash, buf);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user