aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2014-11-23 08:58:35 +0000
committerFrancis Rowe <info@gluglug.org.uk>2014-11-23 08:58:35 +0000
commit1bf083d7eb18d383c708980072adc1a02d491875 (patch)
treecb78fa30032d337be03070b16a2ac6055939623b
parentfbbcac0dcbc6f73f575dd9c36f7ed0bbd4104018 (diff)
downloadlibrebootfr-1bf083d7eb18d383c708980072adc1a02d491875.tar.gz
librebootfr-1bf083d7eb18d383c708980072adc1a02d491875.zip
Update flashrom
-rwxr-xr-xgetflashrom2
-rw-r--r--resources/flashrom/patch/flashchips.c40
-rw-r--r--resources/flashrom/patch/flashchips.c_lenovobios_macronix40
-rw-r--r--resources/flashrom/patch/flashchips.c_lenovobios_sst40
4 files changed, 121 insertions, 1 deletions
diff --git a/getflashrom b/getflashrom
index 8b2a409f..c3d59cf3 100755
--- a/getflashrom
+++ b/getflashrom
@@ -33,7 +33,7 @@ rm -rf flashrom
# ---------------------------------------------------------------------
# download it using subversion
-svn co -r 1850 svn://flashrom.org/flashrom/trunk flashrom
+svn co -r 1854 svn://flashrom.org/flashrom/trunk flashrom
# there are no permanent patches needed to be applied here:
# the patches are applied selectively at build time (when running "builddeps-flashrom")
diff --git a/resources/flashrom/patch/flashchips.c b/resources/flashrom/patch/flashchips.c
index 36609455..377232a5 100644
--- a/resources/flashrom/patch/flashchips.c
+++ b/resources/flashrom/patch/flashchips.c
@@ -12866,6 +12866,46 @@ const struct flashchip flashchips[] = {
{
.vendor = "Winbond",
+ .name = "W25Q40.V",
+ .bustype = BUS_SPI,
+ .manufacture_id = WINBOND_NEX_ID,
+ .model_id = WINBOND_NEX_W25Q40_V,
+ .total_size = 512,
+ .page_size = 256,
+ /* supports SFDP */
+ /* OTP: 756B total; read 0x48; write 0x42, erase 0x44, read ID 0x4B */
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP,
+ .tested = TEST_OK_PR,
+ .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, /* Multi I/O supported */
+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
+ .voltage = {2700, 3600},
+ },
+
+ {
+ .vendor = "Winbond",
.name = "W25Q80.V",
.bustype = BUS_SPI,
.manufacture_id = WINBOND_NEX_ID,
diff --git a/resources/flashrom/patch/flashchips.c_lenovobios_macronix b/resources/flashrom/patch/flashchips.c_lenovobios_macronix
index b614d7af..81b927f5 100644
--- a/resources/flashrom/patch/flashchips.c_lenovobios_macronix
+++ b/resources/flashrom/patch/flashchips.c_lenovobios_macronix
@@ -12940,6 +12940,46 @@ const struct flashchip flashchips[] = {
{
.vendor = "Winbond",
+ .name = "W25Q40.V",
+ .bustype = BUS_SPI,
+ .manufacture_id = WINBOND_NEX_ID,
+ .model_id = WINBOND_NEX_W25Q40_V,
+ .total_size = 512,
+ .page_size = 256,
+ /* supports SFDP */
+ /* OTP: 756B total; read 0x48; write 0x42, erase 0x44, read ID 0x4B */
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP,
+ .tested = TEST_OK_PR,
+ .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, /* Multi I/O supported */
+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
+ .voltage = {2700, 3600},
+ },
+
+ {
+ .vendor = "Winbond",
.name = "W25Q80.V",
.bustype = BUS_SPI,
.manufacture_id = WINBOND_NEX_ID,
diff --git a/resources/flashrom/patch/flashchips.c_lenovobios_sst b/resources/flashrom/patch/flashchips.c_lenovobios_sst
index df3c8537..9662e0d0 100644
--- a/resources/flashrom/patch/flashchips.c_lenovobios_sst
+++ b/resources/flashrom/patch/flashchips.c_lenovobios_sst
@@ -12940,6 +12940,46 @@ const struct flashchip flashchips[] = {
{
.vendor = "Winbond",
+ .name = "W25Q40.V",
+ .bustype = BUS_SPI,
+ .manufacture_id = WINBOND_NEX_ID,
+ .model_id = WINBOND_NEX_W25Q40_V,
+ .total_size = 512,
+ .page_size = 256,
+ /* supports SFDP */
+ /* OTP: 756B total; read 0x48; write 0x42, erase 0x44, read ID 0x4B */
+ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP,
+ .tested = TEST_OK_PR,
+ .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, /* Multi I/O supported */
+ .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */
+ .voltage = {2700, 3600},
+ },
+
+ {
+ .vendor = "Winbond",
.name = "W25Q80.V",
.bustype = BUS_SPI,
.manufacture_id = WINBOND_NEX_ID,