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 /sfdp.c | |
| 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 'sfdp.c')
| -rw-r--r-- | sfdp.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -83,7 +83,7 @@ static int sfdp_add_uniform_eraser(struct flashchip *chip, uint8_t opcode, uint3 uint32_t total_size = chip->total_size * 1024; erasefunc_t *erasefn = spi_get_erasefn_from_opcode(opcode); - if (erasefn == NULL || total_size == 0 || block_size == 0 || + if (erasefn == NO_BLOCK_ERASE_FUNC || total_size == 0 || block_size == 0 || total_size % block_size != 0) { msg_cdbg("%s: invalid input, please report to " "flashrom@flashrom.org\n", __func__); @@ -101,7 +101,7 @@ static int sfdp_add_uniform_eraser(struct flashchip *chip, uint8_t opcode, uint3 return 1; } if (eraser->eraseblocks[0].size != 0 || - eraser->block_erase != NULL) { + eraser->block_erase != NO_BLOCK_ERASE_FUNC) { msg_cspew(" Block Eraser %d is already occupied.\n", i); continue; |