Add #defines for some flash chips
Add timing info to some flash chips.
Corresponding to flashrom svn r584.
Signed-off-by: Mateusz Murawski <matowy@tlen.pl>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
diff --git a/flashchips.c b/flashchips.c
index 5489ea8..261819c 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -1083,9 +1083,9 @@
{
.vendor = "Intel",
.name = "82802AB",
- .bustype = CHIP_BUSTYPE_NONSPI,
+ .bustype = CHIP_BUSTYPE_FWH,
.manufacture_id = INTEL_ID,
- .model_id = 173,
+ .model_id = I_82802AB,
.total_size = 512,
.page_size = 64 * 1024,
.tested = TEST_OK_PREW,
@@ -1099,9 +1099,9 @@
{
.vendor = "Intel",
.name = "82802AC",
- .bustype = CHIP_BUSTYPE_NONSPI,
+ .bustype = CHIP_BUSTYPE_FWH,
.manufacture_id = INTEL_ID,
- .model_id = 172,
+ .model_id = I_82802AC,
.total_size = 1024,
.page_size = 64 * 1024,
.tested = TEST_OK_PREW,
@@ -1341,7 +1341,7 @@
.name = "M25PE10",
.bustype = CHIP_BUSTYPE_SPI,
.manufacture_id = ST_ID,
- .model_id = 0x8011,
+ .model_id = ST_M25PE10,
.total_size = 128,
.page_size = 256,
.tested = TEST_UNTESTED,
@@ -1357,7 +1357,7 @@
.name = "M25PE20",
.bustype = CHIP_BUSTYPE_SPI,
.manufacture_id = ST_ID,
- .model_id = 0x8012,
+ .model_id = ST_M25PE20,
.total_size = 256,
.page_size = 256,
.tested = TEST_UNTESTED,
@@ -1373,7 +1373,7 @@
.name = "M25PE40",
.bustype = CHIP_BUSTYPE_SPI,
.manufacture_id = ST_ID,
- .model_id = 0x8013,
+ .model_id = ST_M25PE40,
.total_size = 256,
.page_size = 256,
.tested = TEST_UNTESTED,
@@ -1389,7 +1389,7 @@
.name = "M25PE80",
.bustype = CHIP_BUSTYPE_SPI,
.manufacture_id = ST_ID,
- .model_id = 0x8014,
+ .model_id = ST_M25PE80,
.total_size = 1024,
.page_size = 256,
.tested = TEST_OK_PREW,
@@ -1405,7 +1405,7 @@
.name = "M25PE16",
.bustype = CHIP_BUSTYPE_SPI,
.manufacture_id = ST_ID,
- .model_id = 0x8015,
+ .model_id = ST_M25PE16,
.total_size = 2048,
.page_size = 256,
.tested = TEST_UNTESTED,
@@ -1644,8 +1644,8 @@
.vendor = "SST",
.name = "SST25VF040.REMS",
.bustype = CHIP_BUSTYPE_SPI,
- .manufacture_id = 0xbf,
- .model_id = 0x44,
+ .manufacture_id = SST_ID,
+ .model_id = SST_25VF040_REMS,
.total_size = 512,
.page_size = 64*1024,
.tested = TEST_OK_PR,
@@ -1660,8 +1660,8 @@
.vendor = "SST",
.name = "SST25VF040B.REMS",
.bustype = CHIP_BUSTYPE_SPI,
- .manufacture_id = 0xbf,
- .model_id = 0x8d,
+ .manufacture_id = SST_ID,
+ .model_id = SST_25VF040B_REMS,
.total_size = 512,
.page_size = 64*1024,
.tested = TEST_OK_PR,
@@ -1714,7 +1714,7 @@
.page_size = 128,
.tested = TEST_OK_PREW,
.probe = probe_jedec,
- .probe_timing = TIMING_FIXME,
+ .probe_timing = 10,
.erase = erase_chip_jedec,
.write = write_jedec,
.read = read_memmapped,
@@ -1730,7 +1730,7 @@
.page_size = 128,
.tested = TEST_UNTESTED,
.probe = probe_jedec,
- .probe_timing = TIMING_FIXME,
+ .probe_timing = 10,
.erase = erase_chip_jedec,
.write = write_jedec,
.read = read_memmapped,
@@ -1762,7 +1762,7 @@
.page_size = 128,
.tested = TEST_UNTESTED,
.probe = probe_jedec,
- .probe_timing = TIMING_FIXME,
+ .probe_timing = 10,
.erase = erase_chip_jedec,
.write = write_jedec,
.read = read_memmapped,
@@ -1778,7 +1778,7 @@
.page_size = 4096,
.tested = TEST_OK_PREW,
.probe = probe_jedec,
- .probe_timing = TIMING_FIXME,
+ .probe_timing = 1, /* 150 ns */
.erase = erase_chip_jedec,
.write = write_49f002,
.read = read_memmapped,
@@ -1794,7 +1794,7 @@
.page_size = 4096,
.tested = TEST_OK_PREW,
.probe = probe_jedec,
- .probe_timing = TIMING_FIXME,
+ .probe_timing = 1, /* 150 ns */
.erase = erase_chip_jedec,
.write = write_49f002,
.read = read_memmapped,
@@ -1810,7 +1810,7 @@
.page_size = 4096,
.tested = TEST_OK_PREW,
.probe = probe_jedec,
- .probe_timing = TIMING_FIXME,
+ .probe_timing = 1, /* 150 ns */
.erase = erase_chip_jedec,
.write = write_49f002,
.read = read_memmapped,
@@ -1826,7 +1826,7 @@
.page_size = 4096,
.tested = TEST_OK_PREW,
.probe = probe_jedec,
- .probe_timing = TIMING_FIXME,
+ .probe_timing = 1, /* 150 ns*/
.erase = erase_chip_jedec,
.write = write_49f002,
.read = read_memmapped,
@@ -1842,7 +1842,7 @@
.page_size = 4096,
.tested = TEST_OK_PREW,
.probe = probe_jedec,
- .probe_timing = TIMING_FIXME,
+ .probe_timing = 1, /* 150 ns */
.erase = erase_chip_jedec,
.write = write_49f002,
.read = read_memmapped,
@@ -1858,7 +1858,7 @@
.page_size = 4096,
.tested = TEST_OK_PREW,
.probe = probe_jedec,
- .probe_timing = TIMING_FIXME,
+ .probe_timing = 1, /* 150 ns */
.erase = erase_chip_jedec,
.write = write_49f002,
.read = read_memmapped,
@@ -1874,7 +1874,7 @@
.page_size = 4096,
.tested = TEST_OK_PROBE,
.probe = probe_jedec,
- .probe_timing = TIMING_FIXME,
+ .probe_timing = 1, /* 150 ns */
.erase = erase_chip_jedec,
.write = write_49f002,
.read = read_memmapped,
@@ -1884,13 +1884,13 @@
.vendor = "SST",
.name = "SST39VF080",
.bustype = CHIP_BUSTYPE_NONSPI,
- .manufacture_id = 0xbf,
- .model_id = 0xd8,
+ .manufacture_id = SST_ID,
+ .model_id = SST_39VF080,
.total_size = 1024,
.page_size = 4096,
.tested = TEST_UNTESTED,
.probe = probe_jedec,
- .probe_timing = TIMING_FIXME,
+ .probe_timing = 1, /* 150 ns */
.erase = erase_chip_jedec,
.write = write_49f002,
.read = read_memmapped,
@@ -2011,14 +2011,14 @@
{
.vendor = "SST",
.name = "SST49LF020",
- .bustype = CHIP_BUSTYPE_NONSPI,
+ .bustype = CHIP_BUSTYPE_LPC,
.manufacture_id = SST_ID,
.model_id = SST_49LF020,
.total_size = 256,
.page_size = 16 * 1024,
.tested = TEST_OK_PR,
.probe = probe_jedec,
- .probe_timing = TIMING_FIXME,
+ .probe_timing = 1, /* 150 ns */
.erase = erase_49lf040,
.write = write_49lf040,
.read = read_memmapped,
@@ -2027,14 +2027,14 @@
{
.vendor = "SST",
.name = "SST49LF020A",
- .bustype = CHIP_BUSTYPE_NONSPI,
+ .bustype = CHIP_BUSTYPE_LPC,
.manufacture_id = SST_ID,
.model_id = SST_49LF020A,
.total_size = 256,
.page_size = 16 * 1024,
.tested = TEST_UNTESTED,
.probe = probe_jedec,
- .probe_timing = TIMING_FIXME,
+ .probe_timing = 1, /* 150 ns */
.erase = erase_49lf040,
.write = write_49lf040,
.read = read_memmapped,
@@ -2043,14 +2043,14 @@
{
.vendor = "SST",
.name = "SST49LF040",
- .bustype = CHIP_BUSTYPE_NONSPI,
+ .bustype = CHIP_BUSTYPE_LPC,
.manufacture_id = SST_ID,
.model_id = SST_49LF040,
.total_size = 512,
.page_size = 4096,
.tested = TEST_OK_PREW,
.probe = probe_jedec,
- .probe_timing = TIMING_FIXME,
+ .probe_timing = 1, /* 150 ns */
.erase = erase_49lf040,
.write = write_49lf040,
.read = read_memmapped,
@@ -2765,7 +2765,7 @@
.name = "W39V040C",
.bustype = CHIP_BUSTYPE_NONSPI,
.manufacture_id = WINBOND_ID,
- .model_id = 0x50,
+ .model_id = W_39V040C,
.total_size = 512,
.page_size = 64*1024,
.tested = TEST_OK_PREW,