- Use ".V" (and "_V" in macros) for 3.3V Winbond 25Q chips.
   Rename the existing chips and add a .voltage entry where it was missing.
 - Use ".W" (and "_W" in macros) for 1.8V Winbond 25Q chips.
 - Add a feature flag for QPI-enabled chips: FEATURE_QPI.
 - Add W25Q20.W, W25Q40.W, W25Q80.W, W25Q16.W, W25Q32.W, W25Q64.W.

Signed-off-by: Stefan Tauner <[email protected]>
---
 flash.h      |    1 +
 flashchips.c |  274 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 flashchips.h |   20 +++--
 print.c      |   26 +++---
 4 files changed, 287 insertions(+), 34 deletions(-)

diff --git a/flash.h b/flash.h
index a479286..b035330 100644
--- a/flash.h
+++ b/flash.h
@@ -99,6 +99,7 @@ enum write_granularity {
 #define FEATURE_WRSR_EWSR      (1 << 6)
 #define FEATURE_WRSR_WREN      (1 << 7)
 #define FEATURE_OTP            (1 << 8)
+#define FEATURE_QPI            (1 << 9)
 #define FEATURE_WRSR_EITHER    (FEATURE_WRSR_EWSR | FEATURE_WRSR_WREN)
 
 struct flashctx;
diff --git a/flashchips.c b/flashchips.c
index d4ab1be..0e0a1ff 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -9405,13 +9405,14 @@ const struct flashchip flashchips[] = {
 
        {
                .vendor         = "Winbond",
-               .name           = "W25Q80",
+               .name           = "W25Q80.V",
                .bustype        = BUS_SPI,
                .manufacture_id = WINBOND_NEX_ID,
-               .model_id       = WINBOND_NEX_W25Q80,
+               .model_id       = WINBOND_NEX_W25Q80_V,
                .total_size     = 1024,
                .page_size      = 256,
-               /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42 */
+               /* supports SFDP */
+               /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, 
erase 0x44, read ID 0x4B */
                .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP,
                .tested         = TEST_OK_PREW,
                .probe          = probe_spi_rdid,
@@ -9444,13 +9445,14 @@ const struct flashchip flashchips[] = {
 
        {
                .vendor         = "Winbond",
-               .name           = "W25Q16",
+               .name           = "W25Q16.V",
                .bustype        = BUS_SPI,
                .manufacture_id = WINBOND_NEX_ID,
-               .model_id       = WINBOND_NEX_W25Q16,
+               .model_id       = WINBOND_NEX_W25Q16_V,
                .total_size     = 2048,
                .page_size      = 256,
-               /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42 */
+               /* supports SFDP */
+               /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, 
erase 0x44, read ID 0x4B */
                .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP,
                .tested         = TEST_OK_PREW,
                .probe          = probe_spi_rdid,
@@ -9483,13 +9485,14 @@ const struct flashchip flashchips[] = {
 
        {
                .vendor         = "Winbond",
-               .name           = "W25Q32",
+               .name           = "W25Q32.V",
                .bustype        = BUS_SPI,
                .manufacture_id = WINBOND_NEX_ID,
-               .model_id       = WINBOND_NEX_W25Q32,
+               .model_id       = WINBOND_NEX_W25Q32_V,
                .total_size     = 4096,
                .page_size      = 256,
-               /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42 */
+               /* supports SFDP */
+               /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, 
erase 0x44, read ID 0x4B */
                .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP,
                .tested         = TEST_OK_PREW,
                .probe          = probe_spi_rdid,
@@ -9522,13 +9525,14 @@ const struct flashchip flashchips[] = {
 
        {
                .vendor         = "Winbond",
-               .name           = "W25Q64",
+               .name           = "W25Q64.V",
                .bustype        = BUS_SPI,
                .manufacture_id = WINBOND_NEX_ID,
-               .model_id       = WINBOND_NEX_W25Q64,
+               .model_id       = WINBOND_NEX_W25Q64_V,
                .total_size     = 8192,
                .page_size      = 256,
-               /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42 */
+               /* supports SFDP */
+               /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, 
erase 0x44, read ID 0x4B */
                .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP,
                .tested         = TEST_OK_PREW,
                .probe          = probe_spi_rdid,
@@ -9556,17 +9560,19 @@ const struct flashchip flashchips[] = {
                .unlock         = spi_disable_blockprotect,
                .write          = spi_chip_write_256,
                .read           = spi_chip_read,
+               .voltage        = {2700, 3600},
        },
 
        {
                .vendor         = "Winbond",
-               .name           = "W25Q128",
+               .name           = "W25Q128.V",
                .bustype        = BUS_SPI,
                .manufacture_id = WINBOND_NEX_ID,
-               .model_id       = WINBOND_NEX_W25Q128,
+               .model_id       = WINBOND_NEX_W25Q128_V,
                .total_size     = 16384,
                .page_size      = 256,
-               /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42 */
+               /* supports SFDP */
+               /* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, 
erase 0x44, read ID 0x4B */
                .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP,
                .tested         = TEST_OK_PROBE,
                .probe          = probe_spi_rdid,
@@ -9594,6 +9600,244 @@ const struct flashchip flashchips[] = {
                .unlock         = spi_disable_blockprotect,
                .write          = spi_chip_write_256,
                .read           = spi_chip_read,
+               .voltage        = {2700, 3600},
+       },
+
+       {
+               .vendor         = "Winbond",
+               .name           = "W25Q20.W",
+               .bustype        = BUS_SPI,
+               .manufacture_id = WINBOND_NEX_ID,
+               .model_id       = WINBOND_NEX_W25Q20_W,
+               .total_size     = 256,
+               .page_size      = 256,
+               /* OTP: 256B total; read 0x48; write 0x42, erase 0x44, read ID 
0x4B */
+               .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP,
+               .tested         = TEST_UNTESTED,
+               .probe          = probe_spi_rdid,
+               .probe_timing   = TIMING_ZERO,
+               .block_erasers  =
+               {
+                       {
+                               .eraseblocks = { {4 * 1024, 64} },
+                               .block_erase = spi_block_erase_20,
+                       }, {
+                               .eraseblocks = { {32 * 1024, 8} },
+                               .block_erase = spi_block_erase_52,
+                       }, {
+                               .eraseblocks = { {64 * 1024, 4} },
+                               .block_erase = spi_block_erase_d8,
+                       }, {
+                               .eraseblocks = { {256 * 1024, 1} },
+                               .block_erase = spi_block_erase_60,
+                       }, {
+                               .eraseblocks = { {256 * 1024, 1} },
+                               .block_erase = spi_block_erase_c7,
+                       }
+               },
+               .printlock      = spi_prettyprint_status_register_plain, /* 
TODO: improve */
+               .unlock         = spi_disable_blockprotect,
+               .write          = spi_chip_write_256,
+               .read           = spi_chip_read,
+               .voltage        = {1700, 1950}, /* Fast read (0x0B) and multi 
I/O supported */
+       },
+
+       {
+               .vendor         = "Winbond",
+               .name           = "W25Q40.W",
+               .bustype        = BUS_SPI,
+               .manufacture_id = WINBOND_NEX_ID,
+               .model_id       = WINBOND_NEX_W25Q40_W,
+               .total_size     = 512,
+               .page_size      = 256,
+               /* OTP: 256B total; read 0x48; write 0x42, erase 0x44, read ID 
0x4B */
+               .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP,
+               .tested         = TEST_UNTESTED,
+               .probe          = probe_spi_rdid,
+               .probe_timing   = TIMING_ZERO,
+               .block_erasers  =
+               {
+                       {
+                               .eraseblocks = { {4 * 1024, 128} },
+                               .block_erase = spi_block_erase_20,
+                       }, {
+                               .eraseblocks = { {32 * 1024, 16} },
+                               .block_erase = spi_block_erase_52,
+                       }, {
+                               .eraseblocks = { {64 * 1024, 8} },
+                               .block_erase = spi_block_erase_d8,
+                       }, {
+                               .eraseblocks = { {512 * 1024, 1} },
+                               .block_erase = spi_block_erase_60,
+                       }, {
+                               .eraseblocks = { {512 * 1024, 1} },
+                               .block_erase = spi_block_erase_c7,
+                       }
+               },
+               .printlock      = spi_prettyprint_status_register_plain, /* 
TODO: improve */
+               .unlock         = spi_disable_blockprotect,
+               .write          = spi_chip_write_256,
+               .read           = spi_chip_read,
+               .voltage        = {1700, 1950}, /* Fast read (0x0B) and multi 
I/O supported */
+       },
+
+       {
+               .vendor         = "Winbond",
+               .name           = "W25Q80.W",
+               .bustype        = BUS_SPI,
+               .manufacture_id = WINBOND_NEX_ID,
+               .model_id       = WINBOND_NEX_W25Q80_W,
+               .total_size     = 1024,
+               .page_size      = 256,
+               /* OTP: 256B total; read 0x48; write 0x42, erase 0x44, read ID 
0x4B */
+               .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP,
+               .tested         = TEST_UNTESTED,
+               .probe          = probe_spi_rdid,
+               .probe_timing   = TIMING_ZERO,
+               .block_erasers  =
+               {
+                       {
+                               .eraseblocks = { {4 * 1024, 256} },
+                               .block_erase = spi_block_erase_20,
+                       }, {
+                               .eraseblocks = { {32 * 1024, 32} },
+                               .block_erase = spi_block_erase_52,
+                       }, {
+                               .eraseblocks = { {64 * 1024, 16} },
+                               .block_erase = spi_block_erase_d8,
+                       }, {
+                               .eraseblocks = { {1 * 1024 * 1024, 1} },
+                               .block_erase = spi_block_erase_60,
+                       }, {
+                               .eraseblocks = { {1 * 1024 * 1024, 1} },
+                               .block_erase = spi_block_erase_c7,
+                       }
+               },
+               .printlock      = spi_prettyprint_status_register_plain, /* 
TODO: improve */
+               .unlock         = spi_disable_blockprotect,
+               .write          = spi_chip_write_256,
+               .read           = spi_chip_read,
+               .voltage        = {1700, 1950}, /* Fast read (0x0B) and multi 
I/O supported */
+       },
+
+       {
+               .vendor         = "Winbond",
+               .name           = "W25Q16.W",
+               .bustype        = BUS_SPI,
+               .manufacture_id = WINBOND_NEX_ID,
+               .model_id       = WINBOND_NEX_W25Q16_W,
+               .total_size     = 2048,
+               .page_size      = 256,
+               /* OTP: 256B total; read 0x48; write 0x42, erase 0x44, read ID 
0x4B */
+               /* QPI enable 0x38, disable 0xFF */
+               .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI,
+               .tested         = TEST_UNTESTED,
+               .probe          = probe_spi_rdid,
+               .probe_timing   = TIMING_ZERO,
+               .block_erasers  =
+               {
+                       {
+                               .eraseblocks = { {4 * 1024, 512} },
+                               .block_erase = spi_block_erase_20,
+                       }, {
+                               .eraseblocks = { {32 * 1024, 64} },
+                               .block_erase = spi_block_erase_52,
+                       }, {
+                               .eraseblocks = { {64 * 1024, 32} },
+                               .block_erase = spi_block_erase_d8,
+                       }, {
+                               .eraseblocks = { {2 * 1024 * 1024, 1} },
+                               .block_erase = spi_block_erase_60,
+                       }, {
+                               .eraseblocks = { {2 * 1024 * 1024, 1} },
+                               .block_erase = spi_block_erase_c7,
+                       }
+               },
+               .printlock      = spi_prettyprint_status_register_plain, /* 
TODO: improve */
+               .unlock         = spi_disable_blockprotect,
+               .write          = spi_chip_write_256,
+               .read           = spi_chip_read,
+               .voltage        = {1700, 1950}, /* Fast read (0x0B) and multi 
I/O supported */
+       },
+
+       {
+               .vendor         = "Winbond",
+               .name           = "W25Q32.W",
+               .bustype        = BUS_SPI,
+               .manufacture_id = WINBOND_NEX_ID,
+               .model_id       = WINBOND_NEX_W25Q32_W,
+               .total_size     = 4096,
+               .page_size      = 256,
+               /* OTP: 256B total; read 0x48; write 0x42, erase 0x44, read ID 
0x4B */
+               /* QPI enable 0x38, disable 0xFF */
+               .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI,
+               .tested         = TEST_OK_PREW,
+               .probe          = probe_spi_rdid,
+               .probe_timing   = TIMING_ZERO,
+               .block_erasers  =
+               {
+                       {
+                               .eraseblocks = { {4 * 1024, 1024} },
+                               .block_erase = spi_block_erase_20,
+                       }, {
+                               .eraseblocks = { {32 * 1024, 128} },
+                               .block_erase = spi_block_erase_52,
+                       }, {
+                               .eraseblocks = { {64 * 1024, 64} },
+                               .block_erase = spi_block_erase_d8,
+                       }, {
+                               .eraseblocks = { {4 * 1024 * 1024, 1} },
+                               .block_erase = spi_block_erase_60,
+                       }, {
+                               .eraseblocks = { {4 * 1024 * 1024, 1} },
+                               .block_erase = spi_block_erase_c7,
+                       }
+               },
+               .printlock      = spi_prettyprint_status_register_plain, /* 
TODO: improve */
+               .unlock         = spi_disable_blockprotect,
+               .write          = spi_chip_write_256,
+               .read           = spi_chip_read,
+               .voltage        = {1700, 1950}, /* Fast read (0x0B) and multi 
I/O supported */
+       },
+
+       {
+               .vendor         = "Winbond",
+               .name           = "W25Q64.W",
+               .bustype        = BUS_SPI,
+               .manufacture_id = WINBOND_NEX_ID,
+               .model_id       = WINBOND_NEX_W25Q64_W,
+               .total_size     = 8192,
+               .page_size      = 256,
+               /* OTP: 256B total; read 0x48; write 0x42, erase 0x44, read ID 
0x4B */
+               /* QPI enable 0x38, disable 0xFF */
+               .feature_bits   = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI,
+               .tested         = TEST_OK_PREW,
+               .probe          = probe_spi_rdid,
+               .probe_timing   = TIMING_ZERO,
+               .block_erasers  =
+               {
+                       {
+                               .eraseblocks = { {4 * 1024, 2048} },
+                               .block_erase = spi_block_erase_20,
+                       }, {
+                               .eraseblocks = { {32 * 1024, 256} },
+                               .block_erase = spi_block_erase_52,
+                       }, {
+                               .eraseblocks = { {64 * 1024, 128} },
+                               .block_erase = spi_block_erase_d8,
+                       }, {
+                               .eraseblocks = { {8 * 1024 * 1024, 1} },
+                               .block_erase = spi_block_erase_60,
+                       }, {
+                               .eraseblocks = { {8 * 1024 * 1024, 1} },
+                               .block_erase = spi_block_erase_c7,
+                       }
+               },
+               .printlock      = spi_prettyprint_status_register_plain, /* 
TODO: improve */
+               .unlock         = spi_disable_blockprotect,
+               .write          = spi_chip_write_256,
+               .read           = spi_chip_read,
+               .voltage        = {1700, 1950}, /* Fast read (0x0B) and multi 
I/O supported */
        },
 
        {
diff --git a/flashchips.h b/flashchips.h
index 1a0696f..d705c32 100644
--- a/flashchips.h
+++ b/flashchips.h
@@ -649,12 +649,20 @@
 #define WINBOND_NEX_W25X16     0x3015
 #define WINBOND_NEX_W25X32     0x3016
 #define WINBOND_NEX_W25X64     0x3017
-#define WINBOND_NEX_W25Q40     0x4013
-#define WINBOND_NEX_W25Q80     0x4014
-#define WINBOND_NEX_W25Q16     0x4015
-#define WINBOND_NEX_W25Q32     0x4016
-#define WINBOND_NEX_W25Q64     0x4017
-#define WINBOND_NEX_W25Q128    0x4018
+#define WINBOND_NEX_W25Q40_V   0x4013  /* W25Q40BV; W25Q40BL (2.3-3.6V) */
+#define WINBOND_NEX_W25Q80_V   0x4014  /* W25Q80BV */
+#define WINBOND_NEX_W25Q16_V   0x4015  /* W25Q16CV; W25Q16DV */
+#define WINBOND_NEX_W25Q32_V   0x4016  /* W25Q32BV; W25Q32FV in SPI mode 
(default) */
+#define WINBOND_NEX_W25Q64_V   0x4017  /* W25Q64BV, W25Q64CV; W25Q64FV in SPI 
mode (default) */
+#define WINBOND_NEX_W25Q128_V  0x4018  /* W25Q128BV; W25Q128FV in SPI mode 
(default) */
+#define WINBOND_NEX_W25Q256_V  0x4019  /* W25Q256FV */
+#define WINBOND_NEX_W25Q20_W   0x5012  /* W25Q20BW */
+#define WINBOND_NEX_W25Q40_W   0x5013  /* W25Q40BW */
+#define WINBOND_NEX_W25Q80_W   0x5014  /* W25Q80BW */
+#define WINBOND_NEX_W25Q16_W   0x6015  /* W25Q16DW */
+#define WINBOND_NEX_W25Q32_W   0x6016  /* W25Q32DW; W25Q32FV in QPI mode */
+#define WINBOND_NEX_W25Q64_W   0x6017  /* W25Q64DW; W25Q64FV in QPI mode */
+#define WINBOND_NEX_W25Q128_W  0x6018  /* (No W version known) W25Q128FV in 
QPI mode */
 
 #define WINBOND_ID             0xDA    /* Winbond */
 #define WINBOND_W19B160BB      0x49
diff --git a/print.c b/print.c
index ecde90f..7d2e5a0 100644
--- a/print.c
+++ b/print.c
@@ -544,7 +544,7 @@ const struct board_info boards_known[] = {
        B("ASRock",     "G31M-S rev 2.0",       OK, 
"http://www.asrock.com/mb/overview.asp?model=G31M-S";, NULL),
        B("ASRock",     "ConRoeXFire-eSATA2",   OK, 
"http://www.asrock.com/mb/overview.asp?model=conroexfire-esata2";, NULL),
        B("ASRock",     "H61M-ITX",             BAD, 
"http://www.asrock.com/mb/overview.asp?Model=H61M-ITX";, "Probing works 
(Macronix MX25L3205, 4096 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
-       B("ASRock",     "H67M",                 BAD, 
"http://www.asrock.com/mb/overview.asp?Model=H67M";, "Probing works (Winbond 
W25Q64, 8192 kB, SPI), but parts of the flash are problematic: descriptor is 
r/o (conforming to ICH reqs), ME region is locked."),
+       B("ASRock",     "H67M",                 BAD, 
"http://www.asrock.com/mb/overview.asp?Model=H67M";, "Probing works (Winbond 
W25Q64.V, 8192 kB, SPI), but parts of the flash are problematic: descriptor is 
r/o (conforming to ICH reqs), ME region is locked."),
        B("ASRock",     "K7S41",                OK, 
"http://www.asrock.com/mb/overview.asp?Model=K7S41";, NULL),
        B("ASRock",     "K7S41GX",              OK, 
"http://www.asrock.com/mb/overview.asp?Model=K7S41GX";, NULL),
        B("ASRock",     "K7VT4A+",              BAD, 
"http://www.asrock.com/mb/overview.asp?Model=K7VT4A%2b";, "No chip found, 
probably due to flash translation. 
http://www.flashrom.org/pipermail/flashrom/2009-August/000393.html";),
@@ -683,16 +683,16 @@ const struct board_info boards_known[] = {
        B("ASUS",       "P6T Deluxe V2",        OK, 
"http://www.asus.com/Motherboards/Intel_Socket_1366/P6T_Deluxe_V2/";, NULL),
        B("ASUS",       "P7H57D-V EVO",         OK, 
"http://www.asus.com/Motherboards/Intel_Socket_1156/P7H57DV_EVO/";, NULL),
        B("ASUS",       "P7H55-M LX",           BAD, NULL, "flashrom works 
correctly, but GbE LAN is nonworking (probably due to a missing/bogus MAC 
address; see http://www.flashrom.org/pipermail/flashrom/2011-July/007432.html 
and http://ubuntuforums.org/showthread.php?t=1534389 for a possible 
workaround)"),
-       B("ASUS",       "P8B-E/4L",             BAD, NULL, "Probing works 
(Winbond W25Q64, 8192 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
-       B("ASUS",       "P8B WS",               BAD, NULL, "Probing works 
(Winbond W25Q32, 4096 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
-       B("ASUS",       "P8H61 PRO",            BAD, NULL, "Probing works 
(Winbond W25Q32, 4096 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
-       B("ASUS",       "P8H61-M LE/USB3",      BAD, NULL, "Probing works 
(Winbond W25Q32, 4096 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
+       B("ASUS",       "P8B-E/4L",             BAD, NULL, "Probing works 
(Winbond W25Q64.V, 8192 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
+       B("ASUS",       "P8B WS",               BAD, NULL, "Probing works 
(Winbond W25Q32.V, 4096 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
+       B("ASUS",       "P8H61 PRO",            BAD, NULL, "Probing works 
(Winbond W25Q32.V, 4096 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
+       B("ASUS",       "P8H61-M LE/USB3",      BAD, NULL, "Probing works 
(Winbond W25Q32.V, 4096 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
        B("ASUS",       "P8H67-M PRO",          BAD, NULL, "Probing works 
(Macronix MX25L3205, 4096 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
        B("ASUS",       "P8P67 (rev. 3.1)",     BAD, NULL, "Probing works 
(Macronix MX25L3205, 4096 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
-       B("ASUS",       "P8P67 LE",             BAD, NULL, "Probing works 
(Winbond W25Q32, 4096 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
+       B("ASUS",       "P8P67 LE",             BAD, NULL, "Probing works 
(Winbond W25Q32.V, 4096 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
        B("ASUS",       "P8P67 PRO (rev. 3.0)", OK, 
"http://www.asus.com/Motherboards/Intel_Socket_1155/P8P67_PRO/";, NULL),
        B("ASUS",       "P8Z68-V",              OK, 
"http://www.asus.com/Motherboards/Intel_Socket_1155/P8Z68V/";, "Warning: MAC 
address of LOM is stored at 0x1000 - 0x1005 of the image."),
-       B("ASUS",       "P8Z68-V PRO",          BAD, NULL, "Probing works 
(Winbond W25Q64, 8192 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
+       B("ASUS",       "P8Z68-V PRO",          BAD, NULL, "Probing works 
(Winbond W25Q64.V, 8192 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
        B("ASUS",       "P8Z68-V PRO/GEN3",     OK, 
"http://www.asus.com/Motherboards/Intel_Socket_1155/P8Z68V_PROGEN3/";, "Warning: 
MAC address of LOM is stored at 0x1000 - 0x1005 of the image."),
        B("ASUS",       "SABERTOOTH 990FX",     OK, 
"http://www.asus.com/Motherboards/AMD_AM3Plus/SABERTOOTH_990FX/";, NULL),
        B("ASUS",       "SABERTOOTH 990FX R2.0", OK, 
"http://www.asus.com/Motherboards/AMD_AM3Plus/SABERTOOTH_990FX_R20/";, NULL),
@@ -895,8 +895,8 @@ const struct board_info boards_known[] = {
        B("MSI",        "MS-7596 (785GM-E51)",  OK, 
"http://www.msi.com/product/mb/785GM-E51.html";, NULL),
        B("MSI",        "MS-7597 (GF615M-P33)", BAD, NULL, "Missing board 
enable/SIO support (Fintek F71889), see 
http://www.flashrom.org/pipermail/flashrom/2012-March/008956.html";),
        B("MSI",        "MS-7599 (870-C45)",    OK, 
"http://www.msi.com/product/mb/870-C45.html";, NULL),
-       B("MSI",        "MS-7613 (Iona-GL8E)",  BAD, 
"http://h10025.www1.hp.com/ewfrf/wc/document?docname=c02014355&lc=en&cc=dk&dlc=en&product=4348478";,
 "Probing works (Winbond W25Q64, 8192 kB, SPI), but parts of the flash are 
problematic: descriptor is r/o (conforming to ICH reqs), ME region is locked."),
-       B("MSI",        "MS-7635 (H55M-ED55)",  BAD, 
"http://www.msi.com/product/mb/H55M-ED55.html";, "Probing works (Winbond W25Q64, 
8192 kB, SPI), but parts of the flash are problematic: descriptor is r/o 
(conforming to ICH reqs), ME region is locked."),
+       B("MSI",        "MS-7613 (Iona-GL8E)",  BAD, 
"http://h10025.www1.hp.com/ewfrf/wc/document?docname=c02014355&lc=en&cc=dk&dlc=en&product=4348478";,
 "Probing works (Winbond W25Q64.V, 8192 kB, SPI), but parts of the flash are 
problematic: descriptor is r/o (conforming to ICH reqs), ME region is locked."),
+       B("MSI",        "MS-7635 (H55M-ED55)",  BAD, 
"http://www.msi.com/product/mb/H55M-ED55.html";, "Probing works (Winbond 
W25Q64.V, 8192 kB, SPI), but parts of the flash are problematic: descriptor is 
r/o (conforming to ICH reqs), ME region is locked."),
        B("MSI",        "MS-7640 (890FXA-GD70)",OK, 
"http://www.msi.com/product/mb/890FXA-GD70.html";, NULL),
        B("MSI",        "MS-7642 (890GXM-G65)", OK, 
"http://www.msi.com/product/mb/890GXM-G65.html";, NULL),
        B("MSI",        "MS-7676 (H67MA-ED55(B3))", OK, 
"http://www.msi.com/product/mb/H67MA-ED55--B3-.html";, "Seems to work fine 
basically, but user reported (hopefully unrelated) buggy behavior of the board 
after a firmware upgrade. See 
http://www.flashrom.org/pipermail/flashrom/2012-January/008547.html";),
@@ -956,8 +956,8 @@ const struct board_info boards_known[] = {
        B("Supermicro", "X9DRT-HF+",            BAD, NULL, "Probing works 
(Numonyx N25Q128 (supported by SFDP only atm), 16384 kB, SPI), but parts of the 
flash are problematic: descriptor is r/o (conforming to ICH reqs), ME region is 
locked; SMM protection enabled."),
        B("Supermicro", "X9DRW",                BAD, NULL, "Probing works 
(Numonyx N25Q128 (supported by SFDP only atm), 16384 kB, SPI), but parts of the 
flash are problematic: descriptor is r/o (conforming to ICH reqs), ME region is 
locked."),
        B("Supermicro", "X9QRi-F+",             BAD, 
"http://www.supermicro.com/products/motherboard/Xeon/C600/X9QRi-F_.cfm";, 
"Probing works (Macronix MX25L12805, 16384 kB, SPI), but parts of the flash are 
problematic: descriptor is r/o (conforming to ICH reqs), ME region is locked; 
SMM protection enabled."),
-       B("Supermicro", "X9SCA-F",              BAD, 
"http://www.supermicro.com/products/motherboard/Xeon/C202_C204/X9SCA-F.cfm";, 
"Probing works (Winbond W25Q64, 8192 kB, SPI), but parts of the flash are 
problematic: descriptor is r/o (conforming to ICH reqs), ME region is locked."),
-       B("Supermicro", "X9SCL",                BAD, 
"http://www.supermicro.com/products/motherboard/Xeon/C202_C204/X9SCL.cfm";, 
"Probing works (Winbond W25Q64, 8192 kB, SPI), but parts of the flash are 
problematic: descriptor is r/o (conforming to ICH reqs), ME region is locked."),
+       B("Supermicro", "X9SCA-F",              BAD, 
"http://www.supermicro.com/products/motherboard/Xeon/C202_C204/X9SCA-F.cfm";, 
"Probing works (Winbond W25Q64.V, 8192 kB, SPI), but parts of the flash are 
problematic: descriptor is r/o (conforming to ICH reqs), ME region is locked."),
+       B("Supermicro", "X9SCL",                BAD, 
"http://www.supermicro.com/products/motherboard/Xeon/C202_C204/X9SCL.cfm";, 
"Probing works (Winbond W25Q64.V, 8192 kB, SPI), but parts of the flash are 
problematic: descriptor is r/o (conforming to ICH reqs), ME region is locked."),
        B("T-Online",   "S-100",                OK, 
"http://wiki.freifunk-hannover.de/T-Online_S_100";, NULL),
        B("Tekram",     "P6Pro-A5",             OK, 
"http://www.motherboard.cz/mb/tekram/P6Pro-A5.htm";, NULL),
        B("Termtek",    "TK-3370 (Rev:2.5B)",   OK, NULL, NULL),
@@ -1010,8 +1010,8 @@ const struct board_info boards_known[] = {
        B("VIA",        "VB700X",               OK, 
"http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_id=490";,
 NULL),
        B("ZOTAC",      "Fusion-ITX WiFi (FUSION350-A-E)", OK, NULL, NULL),
        B("ZOTAC",      "GeForce 8200",         OK, NULL, NULL),
-       B("ZOTAC",      "H61-ITX WiFi (H61ITX-A-E)", BAD, NULL, "Probing works 
(Winbond W25Q32, 4096 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
-       B("ZOTAC",      "H67-ITX WiFi (H67ITX-C-E)", BAD, NULL, "Probing works 
(Winbond W25Q32, 4096 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
+       B("ZOTAC",      "H61-ITX WiFi (H61ITX-A-E)", BAD, NULL, "Probing works 
(Winbond W25Q32.V, 4096 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
+       B("ZOTAC",      "H67-ITX WiFi (H67ITX-C-E)", BAD, NULL, "Probing works 
(Winbond W25Q32.V, 4096 kB, SPI), but parts of the flash are problematic: 
descriptor is r/o (conforming to ICH reqs), ME region is locked."),
        B("ZOTAC",      "nForce 630i Supreme (N73U-Supreme)", OK, NULL, NULL),
        B("ZOTAC",      "ZBOX AD02 (PLUS)",     OK, NULL, NULL),
        B("ZOTAC",      "ZBOX HD-ID11",         OK, NULL, NULL),
-- 
Kind regards, Stefan Tauner


_______________________________________________
flashrom mailing list
[email protected]
http://www.flashrom.org/mailman/listinfo/flashrom

Reply via email to