Combine block_erase*_en29lv640b and block_erase*_m29f400bt respectively
This patch combines two identical block and chip erase functions respectively:
- Merge block_erase_m29f400bt and block_erase_en29lv640b into
erase_block_shifted_jedec.
- Merge block_erase_chip_m29f400bt and block_erase_chip_en29lv640b into
erase_chip_block_shifted_jedec.
Leave their implementations in en29lv640b.c for now.
Corresponding to flashrom svn r1808.
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
diff --git a/en29lv640b.c b/en29lv640b.c
index 110aa18..a274f62 100644
--- a/en29lv640b.c
+++ b/en29lv640b.c
@@ -86,7 +86,7 @@
return 0;
}
-int erase_en29lv640b(struct flashctx *flash)
+static int erase_chip_shifted_jedec(struct flashctx *flash)
{
chipaddr bios = flash->virtual_memory;
@@ -105,8 +105,7 @@
return 0;
}
-int block_erase_en29lv640b(struct flashctx *flash, unsigned int start,
- unsigned int len)
+int erase_block_shifted_jedec(struct flashctx *flash, unsigned int start, unsigned int len)
{
chipaddr bios = flash->virtual_memory;
chipaddr dst = bios + start;
@@ -126,12 +125,11 @@
return 0;
}
-int block_erase_chip_en29lv640b(struct flashctx *flash, unsigned int address,
- unsigned int blocklen)
+int erase_chip_block_shifted_jedec(struct flashctx *flash, unsigned int address, unsigned int blocklen)
{
if ((address != 0) || (blocklen != flash->chip->total_size * 1024)) {
msg_cerr("%s called with incorrect arguments\n", __func__);
return -1;
}
- return erase_en29lv640b(flash);
+ return erase_chip_shifted_jedec(flash);
}