summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2013-09-12 08:29:06 +0000
committerStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2013-09-12 08:29:06 +0000
commitbeaffd8859cdb8dd7a460810fa68794dfb9c6769 (patch)
tree64161051da3569c3eff1d44fa0fbab934c5d2c36
parent8c4602b8ab34564de9810e3be4b5913e16c55933 (diff)
downloadflashrom-beaffd8859cdb8dd7a460810fa68794dfb9c6769.tar.gz
flashrom-beaffd8859cdb8dd7a460810fa68794dfb9c6769.tar.bz2
flashrom-beaffd8859cdb8dd7a460810fa68794dfb9c6769.zip
Enable sector erase function for selected ST M50 chips
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>
-rw-r--r--flashchips.c8
-rw-r--r--stm50.c24
2 files changed, 22 insertions, 10 deletions
diff --git a/flashchips.c b/flashchips.c
index dbf01bcae..05eb5b39e 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -11022,7 +11022,7 @@ const struct flashchip flashchips[] = {
{4 * 1024, 16}, /* sector */
{4 * 1024, 16}, /* sector */
},
- .block_erase = NULL,
+ .block_erase = erase_sector_stm50,
}, {
.eraseblocks = { {64 * 1024, 8}, },
.block_erase = erase_block_82802ab,
@@ -11055,7 +11055,7 @@ const struct flashchip flashchips[] = {
{64 * 1024, 5}, /* block */
{4 * 1024, 16}, /* sector */
},
- .block_erase = NULL,
+ .block_erase = erase_sector_stm50,
}, {
.eraseblocks = { {64 * 1024, 8}, },
.block_erase = erase_block_82802ab,
@@ -11088,7 +11088,7 @@ const struct flashchip flashchips[] = {
{4 * 1024, 16}, /* sector */
{4 * 1024, 16}, /* sector */
},
- .block_erase = NULL,
+ .block_erase = erase_sector_stm50,
}, {
.eraseblocks = { {64 * 1024, 16}, },
.block_erase = erase_block_82802ab,
@@ -11121,7 +11121,7 @@ const struct flashchip flashchips[] = {
{64 * 1024, 13}, /* block */
{4 * 1024, 16}, /* sector */
},
- .block_erase = NULL,
+ .block_erase = erase_sector_stm50,
}, {
.eraseblocks = { {64 * 1024, 16}, },
.block_erase = erase_block_82802ab,
diff --git a/stm50.c b/stm50.c
index 26bd6ed91..edcfdd225 100644
--- a/stm50.c
+++ b/stm50.c
@@ -84,10 +84,9 @@ int unlock_stm50_uniform(struct flashctx *flash)
return 0;
}
-/* This function is unused. */
-int erase_sector_stm50(struct flashctx *flash, unsigned int sector, unsigned int sectorsize)
+static int stm50_erase_sector(struct flashctx *flash, unsigned int addr)
{
- chipaddr bios = flash->virtual_memory + sector;
+ chipaddr bios = flash->virtual_memory + addr;
// clear status register
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);
programmer_delay(10);
- wait_82802ab(flash);
+ uint8_t status = wait_82802ab(flash);
+ print_status_82802ab(status);
- /* FIXME: Check the status register for errors. */
- return 0;
+ return status == 0x80;
+}
+
+/* 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);
}