diff options
author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2008-01-04 16:22:09 +0000 |
---|---|---|
committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2008-01-04 16:22:09 +0000 |
commit | e973b05710de68556dd5b7f336816b03d2b0e691 (patch) | |
tree | 0bd46b9d23079b543465fa2249887f6b6dc86590 /spi.c | |
parent | 2736e328320cbf524b3e5e93847cb4167062de7c (diff) | |
download | ast2050-flashrom-e973b05710de68556dd5b7f336816b03d2b0e691.zip ast2050-flashrom-e973b05710de68556dd5b7f336816b03d2b0e691.tar.gz |
Print at least the vendor for SPI flash chips if the exact chip ID is unknown
Corresponding to flashrom svn r173 and coreboot v2 svn r3032.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'spi.c')
-rw-r--r-- | spi.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -262,14 +262,19 @@ int probe_spi(struct flashchip *flash) manuf_id = readarr[0]; model_id = (readarr[1] << 8) | readarr[2]; printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, manuf_id, model_id); - if (manuf_id == flash->manufacture_id && model_id == flash->model_id) { - /* Print the status register before erase to tell the + if (manuf_id == flash->manufacture_id && + model_id == flash->model_id) { + /* Print the status register to tell the * user about possible write protection. */ generic_spi_prettyprint_status_register(flash); return 1; } + /* Test if this is a pure vendor match. */ + if (manuf_id == flash->manufacture_id && + GENERIC_DEVICE_ID == flash->model_id) + return 1; } return 0; |