openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-28 15:33:42 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
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 <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
Reviewed-on: https://review.coreboot.org/c/flashrom/+/35037
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
This commit is contained in:
Alan Green 2019-08-23 10:11:37 +10:00 committed by Edward O'Callaghan
parent 71b706f544
commit dd59220e7e
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
flashchips.c
View File

@ -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",