diff options
| author | Urja Rannikko <urjaman@gmail.com> | 2015-06-22 23:59:15 +0000 |
|---|---|---|
| committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2015-06-22 23:59:15 +0000 |
| commit | 0a5f6e43d15c50409eb49369895ba2a56a173d47 (patch) | |
| tree | ac3c8c94e8163897b6efa0710dc544b1fe15f26b /spi25.c | |
| parent | 2a1aabaf90dc68a60fcf9c5d85744f386a4d920a (diff) | |
| download | ast2050-flashrom-0a5f6e43d15c50409eb49369895ba2a56a173d47.zip ast2050-flashrom-0a5f6e43d15c50409eb49369895ba2a56a173d47.tar.gz | |
spi25: ignore 0x00 as a manufacturer id in the generic match
Saying that manufacturer id 0x00 is an "unknown SPI chip"
just confuses people with external programmers without a
proper connection to a chip and makes them think flashrom
doesn't support the chip they're trying to use.
Also causes unnecessary -c requirement with a multiple-slot
(FWH/LPC and SPI) serprog device i was testing.
Corresponding to flashrom svn r1893.
Signed-off-by: Urja Rannikko <urjaman@gmail.com>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Diffstat (limited to 'spi25.c')
| -rw-r--r-- | spi25.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -156,7 +156,7 @@ static int probe_spi_rdid_generic(struct flashctx *flash, int bytes) return 1; /* Test if there is any vendor ID. */ - if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff) + if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff && id1 != 0x00) return 1; return 0; @@ -212,7 +212,7 @@ int probe_spi_rems(struct flashctx *flash) return 1; /* Test if there is any vendor ID. */ - if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff) + if (GENERIC_MANUF_ID == chip->manufacture_id && id1 != 0xff && id1 != 0x00) return 1; return 0; |
