diff options
author | stefanct <stefanct@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2015-06-22 23:59:15 +0000 |
---|---|---|
committer | stefanct <stefanct@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1> | 2015-06-22 23:59:15 +0000 |
commit | 3f58ef952e55ae2c560732439d11bf4ee4672b8f (patch) | |
tree | ac3c8c94e8163897b6efa0710dc544b1fe15f26b /spi25.c | |
parent | 4eca8e7b7f2ddfd3d0c155e4d5d644fc67c13193 (diff) | |
download | flashrom-3f58ef952e55ae2c560732439d11bf4ee4672b8f.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.
Signed-off-by: Urja Rannikko <urjaman@gmail.com>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1893 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
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; |