If a chip is not on the RDID generic vendor list nor on the REMS specific ID list, flashrom will claim that no chip is there

Handle these cases gracefully. flashrom will ignore generic matches if a
specific chip was found, so this will have no impact on supported chips,
but help a lot for a first quick analysis by the user or developer. The only
drawback is that unknown chips may be recognized multiple times until they
are added to flashchips.[ch].

Corresponding to flashrom svn r767.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Marc Jones <marcj303@gmail.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/spi.c b/spi.c
index 48be29a..29c202c 100644
--- a/spi.c
+++ b/spi.c
@@ -281,6 +281,11 @@ static int probe_spi_rdid_generic(struct flashchip *flash, int bytes)
 	    GENERIC_DEVICE_ID == flash->model_id)
 		return 1;
 
+	/* Test if there is any vendor ID. */
+	if (GENERIC_MANUF_ID == flash->manufacture_id &&
+	    id1 != 0xff)
+		return 1;
+
 	return 0;
 }
 
@@ -340,6 +345,11 @@ int probe_spi_rems(struct flashchip *flash)
 	    GENERIC_DEVICE_ID == flash->model_id)
 		return 1;
 
+	/* Test if there is any vendor ID. */
+	if (GENERIC_MANUF_ID == flash->manufacture_id &&
+	    id1 != 0xff)
+		return 1;
+
 	return 0;
 }