Edward O'Callaghan merged this change.

View Change

Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved
flashchips: upstream changes to GD25LQ128

Change name of GD25LQ128 to GD25LQ128CD. This is an upstreaming of the
change from the chromium flashrom repo SHA
6c957d745f5d3dcadd1035734a5cf1b804bd0f2f (Also visible at
https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/+/1181175)

The rationale from that change was:

The GD25LQ128C part is EOL. It's replacement is GD25LQ128D, but
both chips identify in the same manner. Add GD25LQ128D to the name
of the part so that it doesn't confused people.

Making this name consistent will simplify further merging from the
chromium fork.

Change-Id: I57804f1a33170668e029a7b08ac050d9a3bd6dbb
Reviewed-on: https://review.coreboot.org/c/flashrom/+/34735
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 f8d336e..c6f9517 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -5886,10 +5886,10 @@

{
.vendor = "GigaDevice",
- .name = "GD25LQ128",
+ .name = "GD25LQ128C/GD25LQ128D",
.bustype = BUS_SPI,
.manufacture_id = GIGADEVICE_ID,
- .model_id = GIGADEVICE_GD25LQ128,
+ .model_id = GIGADEVICE_GD25LQ128CD,
.total_size = 16384,
.page_size = 256,
/* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44 */
diff --git a/flashchips.h b/flashchips.h
index 006b95e..7b8bf04 100644
--- a/flashchips.h
+++ b/flashchips.h
@@ -381,7 +381,7 @@
#define GIGADEVICE_GD25LQ16 0x6015
#define GIGADEVICE_GD25LQ32 0x6016
#define GIGADEVICE_GD25LQ64 0x6017 /* Same as GD25LQ64B (which is faster) */
-#define GIGADEVICE_GD25LQ128 0x6018
+#define GIGADEVICE_GD25LQ128CD 0x6018
#define GIGADEVICE_GD29GL064CAB 0x7E0601

#define HYUNDAI_ID 0xAD /* Hyundai */

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

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I57804f1a33170668e029a7b08ac050d9a3bd6dbb
Gerrit-Change-Number: 34735
Gerrit-PatchSet: 2
Gerrit-Owner: Alan Green <avg@google.com>
Gerrit-Reviewer: Alan Green <avg@google.com>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-MessageType: merged