David Hendricks merged this change.

View Change

Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved
flashchips: W25Q80.W --> W25Q80BW

The W25Q80BW appears to have been succeeded by the W25Q80EW which has a
different manufacturer ID but is otherwise similar. Consequently, W25Q80.W
no longer matches all chips in this family.

This patch makes the original entry specific to W25Q80BW.

Change-Id: I2980272c2691eb62a68056a7a4c308e9b4810347
Signed-off-by: David Hendricks <dhendricks@fb.com>
Reviewed-on: https://review.coreboot.org/25100
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
---
M flashchips.c
M flashchips.h
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/flashchips.c b/flashchips.c
index f11bd39..70057d4 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -15066,10 +15066,10 @@

{
.vendor = "Winbond",
- .name = "W25Q80.W",
+ .name = "W25Q80BW",
.bustype = BUS_SPI,
.manufacture_id = WINBOND_NEX_ID,
- .model_id = WINBOND_NEX_W25Q80_W,
+ .model_id = WINBOND_NEX_W25Q80BW,
.total_size = 1024,
.page_size = 256,
/* OTP: 256B total; read 0x48; write 0x42, erase 0x44, read ID 0x4B */
diff --git a/flashchips.h b/flashchips.h
index cf8e74a..68a67fa 100644
--- a/flashchips.h
+++ b/flashchips.h
@@ -911,7 +911,7 @@
#define WINBOND_NEX_W25Q256_V 0x4019 /* W25Q256FV */
#define WINBOND_NEX_W25Q20_W 0x5012 /* W25Q20BW */
#define WINBOND_NEX_W25Q40_W 0x5013 /* W25Q40BW */
-#define WINBOND_NEX_W25Q80_W 0x5014 /* W25Q80BW */
+#define WINBOND_NEX_W25Q80BW 0x5014 /* W25Q80BW */
#define WINBOND_NEX_W25Q80EW 0x6014 /* W25Q80EW */
#define WINBOND_NEX_W25Q16_W 0x6015 /* W25Q16DW */
#define WINBOND_NEX_W25Q32_W 0x6016 /* W25Q32DW; W25Q32FV in QPI mode */

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

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I2980272c2691eb62a68056a7a4c308e9b4810347
Gerrit-Change-Number: 25100
Gerrit-PatchSet: 3
Gerrit-Owner: David Hendricks <david.hendricks@gmail.com>
Gerrit-Reviewer: David Hendricks <david.hendricks@gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-Reviewer: Stefan Tauner <stefan.tauner@gmx.at>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>