diff options
author | Nico Huber <nico.h@gmx.de> | 2020-04-27 22:51:49 +0000 |
---|---|---|
committer | Edward O'Callaghan <quasisec@chromium.org> | 2020-05-01 14:06:48 +0000 |
commit | 9dc3d8d35b375eef3e63f3a24a63daaf57caf63b (patch) | |
tree | 1b95a2c76d6273763b5f6c0ee1eda30a67fa63b6 /flashchips.c | |
parent | 7f87f9fdc29519be125a229707830dddc4187d1f (diff) | |
download | flashrom-9dc3d8d35b375eef3e63f3a24a63daaf57caf63b.tar.gz flashrom-9dc3d8d35b375eef3e63f3a24a63daaf57caf63b.tar.bz2 flashrom-9dc3d8d35b375eef3e63f3a24a63daaf57caf63b.zip |
Revert "flashchips: port S25FS(128S) chip from chromiumos"
This reverts commit a3519561bd0fb44153bb376322b799000657576f.
Breaks support for most SPI flash chips. It's too big and too
invasive to be reviewed as a single commit.
The changes to `spi_poll_wip():spi25.c` were not noticed in the
original review that were from the similarly named function and
file `s25f_poll_status():s25f.c` in the downstream Chromium fork.
V.2: Rebase and rephrase commit msg to reflect how the issue
slipped in.
Change-Id: Id2a4593bdb654f8a26957d69d52189ce61621d93
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/40626
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Shiyu Sun <sshiyu@google.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'flashchips.c')
-rw-r--r-- | flashchips.c | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/flashchips.c b/flashchips.c index 974ba811..b4006dfa 100644 --- a/flashchips.c +++ b/flashchips.c @@ -49,7 +49,6 @@ const struct flashchip flashchips[] = { * .eraseblocks[] = Array of { blocksize, blockcount } * .block_erase = Block erase function * } - * .reset = Reset Chip * .printlock = Chip lock status function * .unlock = Chip unlock function * .write = Chip write function @@ -15826,69 +15825,6 @@ const struct flashchip flashchips[] = { { .vendor = "Spansion", - .name = "S25FS128S Large Sectors", - .bustype = BUS_SPI, - .manufacture_id = SPANSION_ID, - .model_id = SPANSION_S25FS128S_L, - .total_size = 16384, - .page_size = 256, - .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_UNTESTED, - .probe = probe_spi_big_spansion, - .probe_timing = TIMING_ZERO, - .block_erasers = - { - { - .eraseblocks = { {64 * 1024, 256} }, - .block_erase = s25fs_block_erase_d8, - }, { - .eraseblocks = { {16 * 1024 * 1024, 1} }, - .block_erase = spi_block_erase_60, - }, { - .eraseblocks = { {16 * 1024 * 1024, 1} }, - .block_erase = spi_block_erase_c7, - }, - }, - .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, - .read = spi_chip_read, - .voltage = {1700, 2000}, - }, - - { - .vendor = "Spansion", - .name = "S25FS128S Small Sectors", - .bustype = BUS_SPI, - .manufacture_id = SPANSION_ID, - .model_id = SPANSION_S25FS128S_S, - .total_size = 16384, - .page_size = 256, - .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PREW, - .probe = probe_spi_big_spansion, - .probe_timing = TIMING_ZERO, - .block_erasers = - { - { - .eraseblocks = { {64 * 1024, 256} }, - .block_erase = s25fs_block_erase_d8, - }, { - .eraseblocks = { {16 * 1024 * 1024, 1} }, - .block_erase = spi_block_erase_60, - }, { - .eraseblocks = { {16 * 1024 * 1024, 1} }, - .block_erase = spi_block_erase_c7, - }, - }, - .reset = s25fs_software_reset, - .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, - .read = spi_chip_read, - .voltage = {1700, 2000}, - }, - - { - .vendor = "Spansion", .name = "S25FL129P......1", /* uniform 256 kB sectors */ .bustype = BUS_SPI, .manufacture_id = SPANSION_ID, |