openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-02 14:33:18 +02:00
Code Issues Releases Wiki Activity

spi25: Remove now obsolete four_bytes_addr_funcs path

Browse Source 
Change-Id: Idb7c576cb159630da2268813388b497cb5f46b43
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/22386
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Nico Huber
2017-10-14 18:18:30 +02:00
parent a1672f8293
commit 7a07722256
4 changed files with 22 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
flashchips.c
View File

@ -8135,13 +8135,6 @@ const struct flashchip flashchips[] = {
.page_size = 256,
/* OTP: 512B total; enter 0xB1, exit 0xC1 */
.feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_SUPPORT,
.four_bytes_addr_funcs =
{
.set_4ba = spi_enter_4ba_b7, /* enter 4-bytes addressing mode by CMD B7 */
.read_nbyte = spi_nbyte_read_4ba, /* read from 4-bytes addressing mode */
.program_byte = spi_byte_program_4ba, /* write from 4-bytes addressing mode */
.program_nbyte = spi_nbyte_program_4ba /* write from 4-bytes addressing mode */
},
.tested = TEST_OK_PREW,
.probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO,
@ -8149,13 +8142,13 @@ const struct flashchip flashchips[] = {
{
{
.eraseblocks = { {4 * 1024, 8192} },
.block_erase = spi_block_erase_20_4ba,
.block_erase = spi_block_erase_20,
}, {
.eraseblocks = { {32 * 1024, 1024} },
.block_erase = spi_block_erase_52_4ba,
.block_erase = spi_block_erase_52,
}, {
.eraseblocks = { {64 * 1024, 512} },
.block_erase = spi_block_erase_d8_4ba,
.block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {32 * 1024 * 1024, 1} },
.block_erase = spi_block_erase_60,
@ -8169,6 +8162,7 @@ const struct flashchip flashchips[] = {
.unlock = spi_disable_blockprotect_bp3_srwd,
.write = spi_chip_write_256,
.read = spi_chip_read, /* Fast read (0x0B) supported */
.set_4ba = spi_enter_4ba_b7,
.voltage = {2700, 3600},
},
@ -8182,13 +8176,6 @@ const struct flashchip flashchips[] = {
.page_size = 256,
/* OTP: 512B total; enter 0xB1, exit 0xC1 */
.feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_SUPPORT,
.four_bytes_addr_funcs =
{
.set_4ba = spi_enter_4ba_b7, /* enter 4-bytes addressing mode by CMD B7 */
.read_nbyte = spi_nbyte_read_4ba, /* read from 4-bytes addressing mode */
.program_byte = spi_byte_program_4ba, /* write from 4-bytes addressing mode */
.program_nbyte = spi_nbyte_program_4ba /* write from 4-bytes addressing mode */
},
.tested = TEST_OK_PREW,
.probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO,
@ -8196,13 +8183,13 @@ const struct flashchip flashchips[] = {
{
{
.eraseblocks = { {4 * 1024, 16384} },
.block_erase = spi_block_erase_20_4ba,
.block_erase = spi_block_erase_20,
}, {
.eraseblocks = { {32 * 1024, 2048} },
.block_erase = spi_block_erase_52_4ba,
.block_erase = spi_block_erase_52,
}, {
.eraseblocks = { {64 * 1024, 1024} },
.block_erase = spi_block_erase_d8_4ba,
.block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {64 * 1024 * 1024, 1} },
.block_erase = spi_block_erase_60,
@ -8216,6 +8203,7 @@ const struct flashchip flashchips[] = {
.unlock = spi_disable_blockprotect_bp3_srwd,
.write = spi_chip_write_256,
.read = spi_chip_read, /* Fast read (0x0B) supported */
.set_4ba = spi_enter_4ba_b7,
.voltage = {2700, 3600},
},
@ -9929,12 +9917,6 @@ const struct flashchip flashchips[] = {
/* supports SFDP */
/* OTP: 64B total; read 0x4B, write 0x42 */
.feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_SUPPORT | FEATURE_4BA_READ | FEATURE_4BA_WRITE,
.four_bytes_addr_funcs =
{
.read_nbyte = spi_nbyte_read_4ba_direct,
.program_byte = spi_byte_program_4ba_direct,
.program_nbyte = spi_nbyte_program_4ba_direct
},
.tested = TEST_OK_PREW,
.probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO,
@ -9968,12 +9950,6 @@ const struct flashchip flashchips[] = {
/* supports SFDP */
/* OTP: 64B total; read 0x4B, write 0x42 */
.feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_SUPPORT | FEATURE_4BA_READ | FEATURE_4BA_WRITE,
.four_bytes_addr_funcs =
{
.read_nbyte = spi_nbyte_read_4ba_direct,
.program_byte = spi_byte_program_4ba_direct,
.program_nbyte = spi_nbyte_program_4ba_direct
},
.tested = TEST_OK_PREW,
.probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO,
@ -14852,13 +14828,6 @@ const struct flashchip flashchips[] = {
/* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */
/* FOUR_BYTE_ADDR: supports 4-bytes addressing mode */
.feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_SUPPORT | FEATURE_4BA_READ,
.four_bytes_addr_funcs =
{
.set_4ba = spi_enter_4ba_b7_we, /* enter 4-bytes addressing mode by CMD B7 + WREN */
.read_nbyte = spi_nbyte_read_4ba_direct, /* read directly from any mode, no need to enter 4ba */
.program_byte = spi_byte_program_4ba, /* write from 4-bytes addressing mode */
.program_nbyte = spi_nbyte_program_4ba /* write from 4-bytes addressing mode */
},
.tested = TEST_OK_PREW,
.probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO,
@ -14866,13 +14835,13 @@ const struct flashchip flashchips[] = {
{
{
.eraseblocks = { {4 * 1024, 8192} },
.block_erase = spi_block_erase_20_4ba, /* erases 4k from 4-bytes addressing mode */
.block_erase = spi_block_erase_20,
}, {
.eraseblocks = { {32 * 1024, 1024} },
.block_erase = spi_block_erase_52_4ba, /* erases 32k from 4-bytes addressing mode */
.block_erase = spi_block_erase_52,
}, {
.eraseblocks = { {64 * 1024, 512} },
.block_erase = spi_block_erase_d8_4ba, /* erases 64k from 4-bytes addressing mode */
.block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {32 * 1024 * 1024, 1} },
.block_erase = spi_block_erase_60,
@ -14885,6 +14854,7 @@ const struct flashchip flashchips[] = {
.unlock = spi_disable_blockprotect,
.write = spi_chip_write_256,
.read = spi_chip_read,
.set_4ba = spi_enter_4ba_b7_we,
.voltage = {2700, 3600},
},