summaryrefslogtreecommitdiffstats
path: root/flashchips.c
diff options
context:
space:
mode:
authorStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2014-06-01 02:21:02 +0000
committerStefan Tauner <stefan.tauner@alumni.tuwien.ac.at>2014-06-01 02:21:02 +0000
commitf2756fa240ccf5b2fe888c4abc9c4cdf33932e3a (patch)
treec35a280fcd8ce8bb56337f783a12eea34203cc6d /flashchips.c
parent1181ee251a831be43881d5a6403c33c4229d2ade (diff)
downloadast2050-flashrom-f2756fa240ccf5b2fe888c4abc9c4cdf33932e3a.zip
ast2050-flashrom-f2756fa240ccf5b2fe888c4abc9c4cdf33932e3a.tar.gz
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>
Diffstat (limited to 'flashchips.c')
-rw-r--r--flashchips.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/flashchips.c b/flashchips.c
index c830436..353575d 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -4730,10 +4730,10 @@ const struct flashchip flashchips[] = {
{8 * 1024, 8},
{64 * 1024, 127},
},
- .block_erase = block_erase_en29lv640b,
+ .block_erase = erase_block_shifted_jedec,
}, {
.eraseblocks = { {8 * 1024 * 1024, 1} },
- .block_erase = block_erase_chip_en29lv640b,
+ .block_erase = erase_chip_block_shifted_jedec,
},
},
.write = write_en29lv640b,
@@ -4827,10 +4827,10 @@ const struct flashchip flashchips[] = {
{32 * 1024, 1},
{64 * 1024, 7},
},
- .block_erase = block_erase_m29f400bt,
+ .block_erase = erase_block_shifted_jedec,
}, {
.eraseblocks = { {512 * 1024, 1} },
- .block_erase = block_erase_chip_m29f400bt,
+ .block_erase = erase_chip_block_shifted_jedec,
},
},
.write = write_m29f400bt,
@@ -4859,10 +4859,10 @@ const struct flashchip flashchips[] = {
{8 * 1024, 2},
{16 * 1024, 1},
},
- .block_erase = block_erase_m29f400bt,
+ .block_erase = erase_block_shifted_jedec,
}, {
.eraseblocks = { {512 * 1024, 1} },
- .block_erase = block_erase_chip_m29f400bt,
+ .block_erase = erase_chip_block_shifted_jedec,
},
},
.write = write_m29f400bt,
@@ -4891,10 +4891,10 @@ const struct flashchip flashchips[] = {
{32 * 1024, 1},
{64 * 1024, 31},
},
- .block_erase = block_erase_m29f400bt,
+ .block_erase = erase_block_shifted_jedec,
}, {
.eraseblocks = { {2048 * 1024, 1} },
- .block_erase = block_erase_chip_m29f400bt,
+ .block_erase = erase_chip_block_shifted_jedec,
},
},
.write = write_m29f400bt, /* Supports a fast mode too */
@@ -4923,10 +4923,10 @@ const struct flashchip flashchips[] = {
{8 * 1024, 2},
{16 * 1024, 1},
},
- .block_erase = block_erase_m29f400bt,
+ .block_erase = erase_block_shifted_jedec,
}, {
.eraseblocks = { {2048 * 1024, 1} },
- .block_erase = block_erase_chip_m29f400bt,
+ .block_erase = erase_chip_block_shifted_jedec,
},
},
.write = write_m29f400bt, /* Supports a fast mode too */
@@ -11292,10 +11292,10 @@ const struct flashchip flashchips[] = {
{32 * 1024, 1},
{64 * 1024, 7},
},
- .block_erase = block_erase_m29f400bt,
+ .block_erase = erase_block_shifted_jedec,
}, {
.eraseblocks = { {512 * 1024, 1} },
- .block_erase = block_erase_chip_m29f400bt,
+ .block_erase = erase_chip_block_shifted_jedec,
}
},
.write = write_m29f400bt,
@@ -11324,10 +11324,10 @@ const struct flashchip flashchips[] = {
{8 * 1024, 2},
{16 * 1024, 1},
},
- .block_erase = block_erase_m29f400bt,
+ .block_erase = erase_block_shifted_jedec,
}, {
.eraseblocks = { {512 * 1024, 1} },
- .block_erase = block_erase_chip_m29f400bt,
+ .block_erase = erase_chip_block_shifted_jedec,
}
},
.write = write_m29f400bt,
OpenPOWER on IntegriCloud