openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-04 23:35:18 +02:00
Code Issues Releases Wiki Activity

Enable sector erase function for selected ST M50 chips

Browse Source 
Affected chips: M50FLW040A, M50FLW040B, M50FLW080A, M50FLW080B.

Corresponding to flashrom svn r1738.

Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
Stefan Tauner
2013-09-12 08:29:06 +00:00
parent 8c4602b8ab
commit beaffd8859
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
flashchips.c
View File

@ -11022,7 +11022,7 @@ const struct flashchip flashchips[] = {
{4 * 1024, 16}, /* sector */ {4 * 1024, 16}, /* sector */
{4 * 1024, 16}, /* sector */ {4 * 1024, 16}, /* sector */
}, },
.block_erase = NULL, .block_erase = erase_sector_stm50,
}, { }, {
.eraseblocks = { {64 * 1024, 8}, }, .eraseblocks = { {64 * 1024, 8}, },
.block_erase = erase_block_82802ab, .block_erase = erase_block_82802ab,
@ -11055,7 +11055,7 @@ const struct flashchip flashchips[] = {
{64 * 1024, 5}, /* block */ {64 * 1024, 5}, /* block */
{4 * 1024, 16}, /* sector */ {4 * 1024, 16}, /* sector */
}, },
.block_erase = NULL, .block_erase = erase_sector_stm50,
}, { }, {
.eraseblocks = { {64 * 1024, 8}, }, .eraseblocks = { {64 * 1024, 8}, },
.block_erase = erase_block_82802ab, .block_erase = erase_block_82802ab,
@ -11088,7 +11088,7 @@ const struct flashchip flashchips[] = {
{4 * 1024, 16}, /* sector */ {4 * 1024, 16}, /* sector */
{4 * 1024, 16}, /* sector */ {4 * 1024, 16}, /* sector */
}, },
.block_erase = NULL, .block_erase = erase_sector_stm50,
}, { }, {
.eraseblocks = { {64 * 1024, 16}, }, .eraseblocks = { {64 * 1024, 16}, },
.block_erase = erase_block_82802ab, .block_erase = erase_block_82802ab,
@ -11121,7 +11121,7 @@ const struct flashchip flashchips[] = {
{64 * 1024, 13}, /* block */ {64 * 1024, 13}, /* block */
{4 * 1024, 16}, /* sector */ {4 * 1024, 16}, /* sector */
}, },
.block_erase = NULL, .block_erase = erase_sector_stm50,
}, { }, {
.eraseblocks = { {64 * 1024, 16}, }, .eraseblocks = { {64 * 1024, 16}, },
.block_erase = erase_block_82802ab, .block_erase = erase_block_82802ab,

24
stm50.c
View File

@ -84,10 +84,9 @@ int unlock_stm50_uniform(struct flashctx *flash)
return 0; return 0;
} }
/* This function is unused. */ static int stm50_erase_sector(struct flashctx *flash, unsigned int addr)
int erase_sector_stm50(struct flashctx *flash, unsigned int sector, unsigned int sectorsize)
{ {
chipaddr bios = flash->virtual_memory + sector; chipaddr bios = flash->virtual_memory + addr;
// clear status register // clear status register
chip_writeb(flash, 0x50, bios); chip_writeb(flash, 0x50, bios);
@ -96,8 +95,21 @@ int erase_sector_stm50(struct flashctx *flash, unsigned int sector, unsigned int
chip_writeb(flash, 0xd0, bios); chip_writeb(flash, 0xd0, bios);
programmer_delay(10); programmer_delay(10);
wait_82802ab(flash); uint8_t status = wait_82802ab(flash);
print_status_82802ab(status);
/* FIXME: Check the status register for errors. */ return status == 0x80;
return 0; }
/* Some ST M50* chips do support erasing of sectors. This function will derive the erase function to use from
* the length of the of the block. For calls that apparently do not address a sector (but a block) we just call
* the block erase function instead. FIXME: This duplicates the behavior of the remaining erasers for blocks and
* might be fixed when flashrom supports multiple functions per eraser or erasers that do erase parts of the
* chip only. */
int erase_sector_stm50(struct flashctx *flash, unsigned int addr, unsigned int len)
{
if (len == 4096)
return stm50_erase_sector(flash, addr);
else
return erase_block_82802ab(flash, addr, len);
} }