From 3f58ef952e55ae2c560732439d11bf4ee4672b8f Mon Sep 17 00:00:00 2001 From: stefanct Date: Mon, 22 Jun 2015 23:59:15 +0000 Subject: 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 Acked-by: Stefan Tauner git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1893 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- spi25.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spi25.c') diff --git a/spi25.c b/spi25.c index 673bdf5..af4b6db 100644 --- a/spi25.c +++ b/spi25.c @@ -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; -- cgit v1.2.1