From 2bc020bf295fa84b6137e22766480402a991035d Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Fri, 5 Jun 2009 13:46:17 +0000 Subject: Add probe timings forgotten in r569 Corresponding to flashrom svn r576. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Paul Menzel --- flashchips.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) (limited to 'flashchips.c') diff --git a/flashchips.c b/flashchips.c index 8dc0ce1c..dd2f2952 100644 --- a/flashchips.c +++ b/flashchips.c @@ -35,7 +35,7 @@ struct flashchip flashchips[] = { * Bus Type, * Total size (kB), Page size (B), * Test status, - * Probe function, Probe function timing argument, Erase function, Write function, Read function + * Probe function, Probe function timing, Erase function, Write function, Read function */ { @@ -176,6 +176,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -191,6 +192,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -206,6 +208,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -221,6 +224,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -236,6 +240,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -251,6 +256,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -266,6 +272,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -281,6 +288,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -296,6 +304,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -311,6 +320,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -326,6 +336,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL /* Incompatible Page write */, .read = spi_chip_read, @@ -341,6 +352,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -356,6 +368,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -371,6 +384,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -387,6 +401,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -402,6 +417,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = NULL /* Incompatible Page write */, .read = spi_chip_read, @@ -482,6 +498,7 @@ struct flashchip flashchips[] = { .page_size = 1056 /* No power of two sizes */, .tested = TEST_BAD_READ, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL /* Incompatible Page write */, .read = NULL /* Incompatible read */, @@ -497,6 +514,7 @@ struct flashchip flashchips[] = { .page_size = 256 /* Size can only be determined from status register */, .tested = TEST_BAD_READ, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL, .read = NULL, @@ -512,6 +530,7 @@ struct flashchip flashchips[] = { .page_size = 256 /* Size can only be determined from status register */, .tested = TEST_BAD_READ, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL, .read = NULL, @@ -527,6 +546,7 @@ struct flashchip flashchips[] = { .page_size = 256 /* Size can only be determined from status register */, .tested = TEST_BAD_READ, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL, .read = NULL, @@ -542,6 +562,7 @@ struct flashchip flashchips[] = { .page_size = 256 /* Size can only be determined from status register */, .tested = TEST_BAD_READ, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL, .read = NULL, @@ -557,6 +578,7 @@ struct flashchip flashchips[] = { .page_size = 512 /* Size can only be determined from status register */, .tested = TEST_BAD_READ, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL, .read = NULL, @@ -572,6 +594,7 @@ struct flashchip flashchips[] = { .page_size = 528 /* No power of two sizes */, .tested = TEST_BAD_READ, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL, .read = NULL /* Incompatible read */, @@ -587,6 +610,7 @@ struct flashchip flashchips[] = { .page_size = 512 /* Size can only be determined from status register */, .tested = TEST_BAD_READ, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL, .read = NULL, @@ -602,6 +626,7 @@ struct flashchip flashchips[] = { .page_size = 1024 /* Size can only be determined from status register */, .tested = TEST_BAD_READ, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL, .read = NULL, @@ -665,6 +690,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_spi_rdid4, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -888,6 +914,7 @@ struct flashchip flashchips[] = { .page_size = 64 * 1024, .tested = TEST_OK_PREW, .probe = probe_82802ab, + .probe_timing = TIMING_IGNORED, /* routine does not use probe_timing (82802ab.c) */ .erase = erase_82802ab, .write = write_82802ab, .read = read_memmapped, @@ -903,6 +930,7 @@ struct flashchip flashchips[] = { .page_size = 64 * 1024, .tested = TEST_OK_PREW, .probe = probe_82802ab, + .probe_timing = TIMING_IGNORED, /* routine does not use probe_timing (82802ab.c) */ .erase = erase_82802ab, .write = write_82802ab, .read = read_memmapped, @@ -918,6 +946,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -933,6 +962,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -948,6 +978,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -963,6 +994,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -978,6 +1010,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -993,6 +1026,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1008,6 +1042,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1023,6 +1058,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1038,6 +1074,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1053,6 +1090,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1068,6 +1106,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1131,6 +1170,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_d8, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1146,6 +1186,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_d8, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1161,6 +1202,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_d8, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1176,6 +1218,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_d8, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1191,6 +1234,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_d8, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1206,6 +1250,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1221,6 +1266,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1236,6 +1282,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1251,6 +1298,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1266,6 +1314,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1281,6 +1330,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1360,6 +1410,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1375,6 +1426,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_1, .read = spi_chip_read, @@ -1390,6 +1442,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_1, .read = spi_chip_read, @@ -1405,6 +1458,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_1, .read = spi_chip_read, @@ -1420,6 +1474,7 @@ struct flashchip flashchips[] = { .page_size = 64*1024, .tested = TEST_OK_PR, .probe = probe_spi_rems, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60, .write = spi_chip_write_1, .read = spi_chip_read, @@ -1435,6 +1490,7 @@ struct flashchip flashchips[] = { .page_size = 64*1024, .tested = TEST_OK_PR, .probe = probe_spi_rems, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_1, .read = spi_chip_read, @@ -1450,6 +1506,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_60_c7, .write = spi_chip_write_1, .read = spi_chip_read, @@ -1881,6 +1938,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1896,6 +1954,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1911,6 +1970,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1926,6 +1986,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1941,6 +2002,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_res, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1956,6 +2018,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1971,6 +2034,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -1986,6 +2050,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -2001,6 +2066,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -2016,6 +2082,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -2367,6 +2434,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -2382,6 +2450,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -2397,6 +2466,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -2412,6 +2482,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = spi_chip_erase_c7, .write = spi_chip_write_256, .read = spi_chip_read, @@ -2651,6 +2722,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_BAD_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL, .read = NULL, @@ -2666,6 +2738,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_BAD_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL, .read = NULL, @@ -2681,6 +2754,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_BAD_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL, .read = NULL, @@ -2696,6 +2770,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_BAD_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL, .read = NULL, @@ -2711,6 +2786,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_BAD_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL, .read = NULL, @@ -2726,6 +2802,7 @@ struct flashchip flashchips[] = { .page_size = 256, .tested = TEST_BAD_PREW, .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, .erase = NULL, .write = NULL, .read = NULL, -- cgit v1.2.3