openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-08-15 19:40:19 +02:00
Code Issues Releases Wiki Activity

Unify chip write functions

Browse Source 
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.

Corresponding to flashrom svn r1208.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
This commit is contained in:
Carl-Daniel Hailfinger
2010-10-10 14:02:27 +00:00
parent b28349f8bc
commit b30a5ed4af
9 changed files with 62 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
sst28sf040.c
View File

@@ -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 @@ static void protect_28sf040(chipaddr bios)
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 @@ int erase_sector_28sf040(struct flashchip *flash, unsigned int address, unsigned
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 @@ int erase_sector_28sf040(struct flashchip *flash, unsigned int address, unsigned
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 @@ static int erase_28sf040(struct flashchip *flash)
{
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 write_28sf040(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;
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;
}