mirror of
https://review.coreboot.org/flashrom.git
synced 2025-04-26 06:32:34 +02:00
Add W25Q...W series
- 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 W25Q20.W, W25Q40.W, W25Q80.W, W25Q16.W, W25Q32.W, W25Q64.W. Based on chromiumos' 469707f0d9b7d81b6c6bb2cace13f09db70f4382 http://git.chromium.org/gitweb/?p=chromiumos/third_party/flashrom.git;a=commitdiff;h=469707f0d9b7d81b6c6bb2cace13f09db70f4382 Corresponding to flashrom svn r1677. Signed-off-by: Yung-Chieh Lo <yjlou%chromium.org@gtempaccount.com> Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
This commit is contained in:
parent
27cb34b8a9
commit
b13d4e6992
274
flashchips.c
274
flashchips.c
@ -10007,13 +10007,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,
|
||||
@ -10046,13 +10047,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,
|
||||
@ -10085,13 +10087,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,
|
||||
@ -10124,13 +10127,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,
|
||||
@ -10158,17 +10162,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,
|
||||
@ -10196,6 +10202,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_UNTESTED,
|
||||
.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 */
|
||||
},
|
||||
|
||||
{
|
||||
|
20
flashchips.h
20
flashchips.h
@ -655,12 +655,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
|
||||
|
Loading…
x
Reference in New Issue
Block a user