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 /flashrom.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 'flashrom.c')
| -rw-r--r-- | flashrom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/flashrom.c b/flashrom.c index e2452c9a6..08e3969e0 100644 --- a/flashrom.c +++ b/flashrom.c @@ -340,18 +340,18 @@ static int check_block_eraser(const struct flashctx *flash, int k, int log) { struct block_eraser eraser = flash->chip->block_erasers[k]; - if (!eraser.block_erase && !eraser.eraseblocks[0].count) { + if (eraser.block_erase == NO_BLOCK_ERASE_FUNC && !eraser.eraseblocks[0].count) { if (log) msg_cdbg("not defined. "); return 1; } - if (!eraser.block_erase && eraser.eraseblocks[0].count) { + if (eraser.block_erase == NO_BLOCK_ERASE_FUNC && eraser.eraseblocks[0].count) { if (log) msg_cdbg("eraseblock layout is known, but matching " "block erase function is not implemented. "); return 1; } - if (eraser.block_erase && !eraser.eraseblocks[0].count) { + if (eraser.block_erase != NO_BLOCK_ERASE_FUNC && !eraser.eraseblocks[0].count) { if (log) msg_cdbg("block erase function found, but " "eraseblock layout is not defined. "); |