aboutsummaryrefslogtreecommitdiffstats
path: root/flashchips.c
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-05-28 17:07:57 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2010-05-28 17:07:57 +0000
commitdc1cda15d48cdbc7d53e4cf86cf39844e4af2a8b (patch)
treef7d7123a8b474227d45bd9f0eae5b819d499b3a8 /flashchips.c
parent80f3d05e7356ec85f9ea27ae2e11245e0b6bb3c6 (diff)
downloadflashrom-dc1cda15d48cdbc7d53e4cf86cf39844e4af2a8b.tar.gz
flashrom-dc1cda15d48cdbc7d53e4cf86cf39844e4af2a8b.tar.bz2
flashrom-dc1cda15d48cdbc7d53e4cf86cf39844e4af2a8b.zip
Add support for two-byte RES probes
Some chips implement the RES (0xab) opcode, but they use a non-standard two byte response instead of the usual one byte response. A two-byte response has the accuracy of REMS and RDID, so don't check for REMS/RDID availability before running a two-byte RES. Corresponding to flashrom svn r1017. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Stefan Reinauer <stepan@coresystems.de>
Diffstat (limited to 'flashchips.c')
-rw-r--r--flashchips.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/flashchips.c b/flashchips.c
index b1af60ac..45f4076e 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -4665,19 +4665,19 @@ struct flashchip flashchips[] = {
/* The ST M25P05 is a bit of a problem. It has the same ID as the
* ST M25P05-A in RES mode, but supports only 128 byte writes instead
- * of 256 byte writes. We rely heavily on the fact that probe_spi_res
+ * of 256 byte writes. We rely heavily on the fact that probe_spi_res1
* only is successful if RDID does not work.
*/
{
.vendor = "ST",
.name = "M25P05.RES",
.bustype = CHIP_BUSTYPE_SPI,
- .manufacture_id = ST_ID,
+ .manufacture_id = 0, /* Not used. */
.model_id = ST_M25P05_RES,
.total_size = 64,
.page_size = 256,
.tested = TEST_UNTESTED,
- .probe = probe_spi_res,
+ .probe = probe_spi_res1,
.probe_timing = TIMING_ZERO,
.block_erasers =
{
@@ -4723,12 +4723,12 @@ struct flashchip flashchips[] = {
.vendor = "ST",
.name = "M25P10.RES",
.bustype = CHIP_BUSTYPE_SPI,
- .manufacture_id = ST_ID,
+ .manufacture_id = 0, /* Not used. */
.model_id = ST_M25P10_RES,
.total_size = 128,
.page_size = 256,
.tested = TEST_UNTESTED,
- .probe = probe_spi_res,
+ .probe = probe_spi_res1,
.probe_timing = TIMING_ZERO,
.block_erasers =
{
@@ -4798,12 +4798,12 @@ struct flashchip flashchips[] = {
.vendor = "ST",
.name = "M25P40-old",
.bustype = CHIP_BUSTYPE_SPI,
- .manufacture_id = ST_ID,
+ .manufacture_id = 0, /* Not used. */
.model_id = ST_M25P40_RES,
.total_size = 512,
.page_size = 256,
.tested = TEST_UNTESTED,
- .probe = probe_spi_res,
+ .probe = probe_spi_res1,
.probe_timing = TIMING_ZERO,
.block_erasers =
{