Alan Green has uploaded this change for review.

View Change

flashchips.c: Put SFDP-capable chip back into position

Put entry for Unknown SFDP-capable chip back into place at end of file.

SHA 1f9cc7d89992114c70f7a0545ad9f98701bebe56 reordered many entries in
flashchips.c, including this one. However, the entry for Unknown,
SFDP-capable chip should not have been moved before any specific chip
entries.

As reported by Angel Pons <th3fanbus@gmail.com> at
https://review.coreboot.org/c/flashrom/+/33931:

"""
Oops, this introduced a bug: the SFDP entry is no longer at the end of
flashchips.c, so probing on a SFDP-capable Winbond chip results in added
noise (flashrom says things about an unknown chip, and then has two
definitions for the same chip).
"""

Signed-off-by: Alan Green <avg@google.com>
Change-Id: I5955020456dbcd5e7db280a459b668a743e464dc
---
M flashchips.c
1 file changed, 22 insertions(+), 22 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/37/35037/1
diff --git a/flashchips.c b/flashchips.c
index c6f9517..9b686c1 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -15612,28 +15612,6 @@
},

{
- .vendor = "Unknown",
- .name = "SFDP-capable chip",
- .bustype = BUS_SPI,
- .manufacture_id = GENERIC_MANUF_ID,
- .model_id = SFDP_DEVICE_ID,
- .total_size = 0, /* set by probing function */
- .page_size = 0, /* set by probing function */
- .feature_bits = 0, /* set by probing function */
- /* We present our own "report this" text hence we do not */
- /* want the default "This flash part has status UNTESTED..." */
- /* text to be printed. */
- .tested = TEST_OK_PREW,
- .probe = probe_spi_sfdp,
- .block_erasers = {}, /* set by probing function */
- .unlock = spi_disable_blockprotect, /* is this safe? */
- .write = NULL, /* set by probing function */
- .read = spi_chip_read,
- /* FIXME: some vendor extensions define this */
- .voltage = {0},
- },
-
- {
.vendor = "Winbond",
.name = "W25P16",
.bustype = BUS_SPI,
@@ -17576,6 +17554,28 @@
},

{
+ .vendor = "Unknown",
+ .name = "SFDP-capable chip",
+ .bustype = BUS_SPI,
+ .manufacture_id = GENERIC_MANUF_ID,
+ .model_id = SFDP_DEVICE_ID,
+ .total_size = 0, /* set by probing function */
+ .page_size = 0, /* set by probing function */
+ .feature_bits = 0, /* set by probing function */
+ /* We present our own "report this" text hence we do not */
+ /* want the default "This flash part has status UNTESTED..." */
+ /* text to be printed. */
+ .tested = TEST_OK_PREW,
+ .probe = probe_spi_sfdp,
+ .block_erasers = {}, /* set by probing function */
+ .unlock = spi_disable_blockprotect, /* is this safe? */
+ .write = NULL, /* set by probing function */
+ .read = spi_chip_read,
+ /* FIXME: some vendor extensions define this */
+ .voltage = {0},
+ },
+
+ {
.vendor = "Programmer",
.name = "Opaque flash chip",
.bustype = BUS_PROG,

To view, visit change 35037. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I5955020456dbcd5e7db280a459b668a743e464dc
Gerrit-Change-Number: 35037
Gerrit-PatchSet: 1
Gerrit-Owner: Alan Green <avg@google.com>
Gerrit-MessageType: newchange