diff options
author | Edward O'Callaghan <quasisec@google.com> | 2023-01-29 11:52:39 +1100 |
---|---|---|
committer | Edward O'Callaghan <quasisec@chromium.org> | 2023-02-02 02:06:52 +0000 |
commit | 3edef2f3a680a57d060c8c787de23c88152d4ef4 (patch) | |
tree | dbc325aeee42c0f99a5a541b63bf19783a0e9996 /jedec.c | |
parent | 8fd4aeb8ec7235a6bc68c16f92e4cc2ccf28cf4c (diff) | |
download | flashrom-3edef2f3a680a57d060c8c787de23c88152d4ef4.tar.gz flashrom-3edef2f3a680a57d060c8c787de23c88152d4ef4.tar.bz2 flashrom-3edef2f3a680a57d060c8c787de23c88152d4ef4.zip |
jedec.c: Collapse erase_block_jedec() indirection
Change-Id: Ia9b539d7fb4a54ba6cc56730e96d35044e291844
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/72501
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'jedec.c')
-rw-r--r-- | jedec.c | 11 |
1 files changed, 2 insertions, 9 deletions
@@ -313,11 +313,11 @@ int erase_sector_jedec(struct flashctx *flash, unsigned int page, unsigned int s return 0; } -static int erase_block_jedec_common(struct flashctx *flash, unsigned int block, - unsigned int blocksize, unsigned int mask) +int erase_block_jedec(struct flashctx *flash, unsigned int block, unsigned int size) { chipaddr bios = flash->virtual_memory; bool shifted = (flash->chip->feature_bits & FEATURE_ADDR_SHIFTED); + const unsigned int mask = getaddrmask(flash->chip); unsigned int delay_us = 0; if(flash->chip->probe_timing != TIMING_ZERO) @@ -529,13 +529,6 @@ int probe_jedec(struct flashctx *flash) return probe_jedec_common(flash, mask); } -int erase_block_jedec(struct flashctx *flash, unsigned int page, - unsigned int size) -{ - const unsigned int mask = getaddrmask(flash->chip); - return erase_block_jedec_common(flash, page, size, mask); -} - struct unlockblock { unsigned int size; unsigned int count; |