From dd59220e7e774d3e8fa100cd0b448fa363e3be73 Mon Sep 17 00:00:00 2001 From: Alan Green Date: Fri, 23 Aug 2019 10:11:37 +1000 Subject: [PATCH] flashchips.c: Put SFDP-capable chip back into position Put entry for Unknown SFDP-capable chip back into place at end of file. Change 1f9cc7d89992114c70f7a0545ad9f98701bebe56 "flashchips.c: Sort file by vendor and model" 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 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 Change-Id: I5955020456dbcd5e7db280a459b668a743e464dc Reviewed-on: https://review.coreboot.org/c/flashrom/+/35037 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Edward O'Callaghan --- flashchips.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/flashchips.c b/flashchips.c index c6f95172a..9b686c1bd 100644 --- a/flashchips.c +++ b/flashchips.c @@ -15611,28 +15611,6 @@ const struct flashchip flashchips[] = { .voltage = {4500, 5500}, }, - { - .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", @@ -17575,6 +17553,28 @@ const struct flashchip flashchips[] = { .voltage = {2700, 3600}, }, + { + .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",