openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00
Code Issues Releases Wiki Activity

spi25: ignore 0x00 as a manufacturer id in the generic match

Browse Source 
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>
This commit is contained in:
Urja Rannikko 2015-06-22 23:59:15 +00:00 committed by Stefan Tauner
parent 2a1aabaf90
commit 0a5f6e43d1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spi25.c
View File

@ -156,7 +156,7 @@ static int probe_spi_rdid_generic(struct flashctx *flash, int bytes)
return 1; return 1;
/* Test if there is any vendor ID. */ /* 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 1;
return 0; return 0;
@ -212,7 +212,7 @@ int probe_spi_rems(struct flashctx *flash)
return 1; return 1;
/* Test if there is any vendor ID. */ /* 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 1;
return 0; return 0;