dummyflasher,flashchips: Change Variable chip manufacturer and dev id
Upstream just uses the dummy chip and so should we.
BUG=b:140394053
BRANCH=none
TEST=builds
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Change-Id: I43451f54f13eb5810945af589d798064970f24bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/+/2413319
Tested-by: Edward O'Callaghan <quasisec@chromium.org>
Commit-Queue: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
Reviewed-by: Sam McNally <sammc@chromium.org>
Auto-Submit: Edward O'Callaghan <quasisec@chromium.org>
diff --git a/dummyflasher.c b/dummyflasher.c
index 1d4a321..c73d534 100644
--- a/dummyflasher.c
+++ b/dummyflasher.c
@@ -743,15 +743,16 @@
if (readcnt > 2)
readarr[2] = 0x18;
break;
- case EMULATE_VARIABLE_SIZE: {
- const uint16_t man_id = VARIABLE_SIZE_MANUF_ID;
- const uint16_t dev_id = VARIABLE_SIZE_DEVICE_ID;
- if (readcnt > 0) readarr[0] = man_id >> 8;
- if (readcnt > 1) readarr[1] = man_id & 0xff;
- if (readcnt > 2) readarr[2] = dev_id >> 8;
- if (readcnt > 3) readarr[3] = dev_id & 0xff;
+ case EMULATE_VARIABLE_SIZE:
+ if (readcnt > 0)
+ readarr[0] = (PROGMANUF_ID >> 8) & 0xff;
+ if (readcnt > 1)
+ readarr[1] = PROGMANUF_ID & 0xff;
+ if (readcnt > 2)
+ readarr[2] = (PROGDEV_ID >> 8) & 0xff;
+ if (readcnt > 3)
+ readarr[3] = PROGDEV_ID & 0xff;
break;
- }
default: /* ignore */
break;
}
diff --git a/flashchips.c b/flashchips.c
index e87da32..e2b731d 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -19135,8 +19135,8 @@
.vendor = "Generic",
.name = "Variable Size SPI chip",
.bustype = BUS_SPI,
- .manufacture_id = VARIABLE_SIZE_MANUF_ID,
- .model_id = VARIABLE_SIZE_DEVICE_ID,
+ .manufacture_id = PROGMANUF_ID,
+ .model_id = PROGDEV_ID,
.total_size = 64, /* This size is set temporarily */
.page_size = 256,
.feature_bits = FEATURE_4BA,
diff --git a/flashchips.h b/flashchips.h
index 9162043..7568ab6 100644
--- a/flashchips.h
+++ b/flashchips.h
@@ -36,9 +36,6 @@
#define PROGMANUF_ID 0xFFFE /* dummy ID for opaque chips behind a programmer */
#define PROGDEV_ID 0x01 /* dummy ID for opaque chips behind a programmer */
-#define VARIABLE_SIZE_MANUF_ID 0x3eaf
-#define VARIABLE_SIZE_DEVICE_ID 0x10af
-
#define ALLIANCE_ID 0x52 /* Alliance Semiconductor */
#define ALLIANCE_AS29F002B 0x34
#define ALLIANCE_AS29F002T 0xB0
