openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

jedec.c: Collapse erase_block_jedec() indirection

Browse Source 
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>
This commit is contained in:
Edward O'Callaghan 2023-01-29 11:52:39 +11:00 committed by Edward O'Callaghan
parent 8fd4aeb8ec
commit 3edef2f3a6
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jedec.c
View File

@ -313,11 +313,11 @@ int erase_sector_jedec(struct flashctx *flash, unsigned int page, unsigned int s
return 0; return 0;
} }
static int erase_block_jedec_common(struct flashctx *flash, unsigned int block, int erase_block_jedec(struct flashctx *flash, unsigned int block, unsigned int size)
unsigned int blocksize, unsigned int mask)
{ {
chipaddr bios = flash->virtual_memory; chipaddr bios = flash->virtual_memory;
bool shifted = (flash->chip->feature_bits & FEATURE_ADDR_SHIFTED); bool shifted = (flash->chip->feature_bits & FEATURE_ADDR_SHIFTED);
const unsigned int mask = getaddrmask(flash->chip);
unsigned int delay_us = 0; unsigned int delay_us = 0;
if(flash->chip->probe_timing != TIMING_ZERO) if(flash->chip->probe_timing != TIMING_ZERO)
@ -529,13 +529,6 @@ int probe_jedec(struct flashctx *flash)
return probe_jedec_common(flash, mask); 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 { struct unlockblock {
unsigned int size; unsigned int size;
unsigned int count; unsigned int count;