Angel Pons submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved
flashchips: change chip name from 'W25Q64JW' to 'W25Q64JW...M'

According to the W25Q64JW datasheet rev. E, only devices ending with the
letter 'M' have a device ID of 8017h. There are other variants with
different device IDs. This patch makes the 'W25Q64JW...M' definition
consistent with the 'W25Q32JW...M' definition.

The device ID macro defined in flashchips.h has also been renamed from
WINBOND_NEX_W25Q64JW to WINBOND_NEX_W25Q64JW_M.

BUG=b:166294558
BRANCH=none
TEST=builds

Change-Id: Ib0dc914da286a191d22e666332b1063b88db4251
Signed-off-by: Nikolai Artemiev <nartemiev@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/54291
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
---
M flashchips.c
M flashchips.h
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/flashchips.c b/flashchips.c
index 1b281aa..ef5ea5e 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -17860,10 +17860,10 @@

{
.vendor = "Winbond",
- .name = "W25Q64JW",
+ .name = "W25Q64JW...M",
.bustype = BUS_SPI,
.manufacture_id = WINBOND_NEX_ID,
- .model_id = WINBOND_NEX_W25Q64JW,
+ .model_id = WINBOND_NEX_W25Q64JW_M,
.total_size = 8192,
.page_size = 256,
/* OTP: 256B total; read 0x48; write 0x42, erase 0x44, read ID 0x4B */
diff --git a/flashchips.h b/flashchips.h
index 4bbaef1..37eadb2 100644
--- a/flashchips.h
+++ b/flashchips.h
@@ -978,7 +978,7 @@
#define WINBOND_NEX_W25Q128_V_M 0x7018 /* W25Q128JVSM */
#define WINBOND_NEX_W25Q256JV_M 0x7019 /* W25Q256JV_M (QE=0) */
#define WINBOND_NEX_W25Q32JW_M 0x8016 /* W25Q32JW...M */
-#define WINBOND_NEX_W25Q64JW 0x8017
+#define WINBOND_NEX_W25Q64JW_M 0x8017 /* W25Q64JW...M */
#define WINBOND_NEX_W25Q128_DTR 0x8018 /* W25Q128JW_DTR */
#define WINBOND_NEX_W25Q256_DTR 0x8019 /* W25Q256JW_DTR aka W25Q256256JW-IM */


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

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Ib0dc914da286a191d22e666332b1063b88db4251
Gerrit-Change-Number: 54291
Gerrit-PatchSet: 2
Gerrit-Owner: Nikolai Artemiev <nartemiev@google.com>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged