diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2022-11-02 12:15:38 +1100 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2022-11-11 07:40:02 +0000 |
| commit | 3c44e12a287ce9a91cf97c3303bf4222f63d25c7 (patch) | |
| tree | 5478f15fc0090fb5785023e4a6e9c6209bd48c11 /tests | |
| parent | 2f0e49c2abc0f8ce46eae9675db38eece066cb5e (diff) | |
| download | flashrom-3c44e12a287ce9a91cf97c3303bf4222f63d25c7.tar.gz flashrom-3c44e12a287ce9a91cf97c3303bf4222f63d25c7.tar.bz2 flashrom-3c44e12a287ce9a91cf97c3303bf4222f63d25c7.zip | |
tree/: Convert flashchips db to use indirection for erase_block
This paves the way to allow for the conversion of flashchip erase_block
func ptr to enumerate values. This change should be a NOP.
TEST=`diff -u <(objdump -D flashchips.o_bk) <(objdump -D flashchips.o)`.
Change-Id: I122295ec9add0fe0efd27273c9725e5d64f6dbe2
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/69131
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/chip.c | 10 | ||||
| -rw-r--r-- | tests/chip_wp.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/chip.c b/tests/chip.c index 8f4771a1d..579643c78 100644 --- a/tests/chip.c +++ b/tests/chip.c @@ -177,19 +177,19 @@ static const struct flashchip chip_W25Q128_V = { { { .eraseblocks = { {4 * 1024, 4096} }, - .block_erase = spi_block_erase_20, + .block_erase = SPI_BLOCK_ERASE_20, }, { .eraseblocks = { {32 * 1024, 512} }, - .block_erase = spi_block_erase_52, + .block_erase = SPI_BLOCK_ERASE_52, }, { .eraseblocks = { {64 * 1024, 256} }, - .block_erase = spi_block_erase_d8, + .block_erase = SPI_BLOCK_ERASE_D8, }, { .eraseblocks = { {16 * 1024 * 1024, 1} }, - .block_erase = spi_block_erase_60, + .block_erase = SPI_BLOCK_ERASE_60, }, { .eraseblocks = { {16 * 1024 * 1024, 1} }, - .block_erase = spi_block_erase_c7, + .block_erase = SPI_BLOCK_ERASE_C7, } }, }; diff --git a/tests/chip_wp.c b/tests/chip_wp.c index 8f6cb5fdc..c308959bf 100644 --- a/tests/chip_wp.c +++ b/tests/chip_wp.c @@ -72,19 +72,19 @@ static const struct flashchip chip_W25Q128_V = { { { .eraseblocks = { {4 * 1024, 4096} }, - .block_erase = spi_block_erase_20, + .block_erase = SPI_BLOCK_ERASE_20, }, { .eraseblocks = { {32 * 1024, 512} }, - .block_erase = spi_block_erase_52, + .block_erase = SPI_BLOCK_ERASE_52, }, { .eraseblocks = { {64 * 1024, 256} }, - .block_erase = spi_block_erase_d8, + .block_erase = SPI_BLOCK_ERASE_D8, }, { .eraseblocks = { {16 * 1024 * 1024, 1} }, - .block_erase = spi_block_erase_60, + .block_erase = SPI_BLOCK_ERASE_60, }, { .eraseblocks = { {16 * 1024 * 1024, 1} }, - .block_erase = spi_block_erase_c7, + .block_erase = SPI_BLOCK_ERASE_C7, } }, .reg_bits = |