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

jedec.c: Collapse erase_chip_block_jedec() indirection

Browse Source 
Change-Id: I6e4a63e4935d4b69b66cbd1888f62b6af066a2ac
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/72503
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 12:32:51 +11:00 committed by Edward O'Callaghan
parent 3edef2f3a6
commit d0fbe5344a
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
jedec.c
View File

@ -345,12 +345,20 @@ int erase_block_jedec(struct flashctx *flash, unsigned int block, unsigned int s
return 0; return 0;
} }
static int erase_chip_jedec_common(struct flashctx *flash, unsigned int mask) /* erase chip with block_erase() prototype */
int erase_chip_block_jedec(struct flashctx *flash, unsigned int addr, unsigned int blocksize)
{ {
chipaddr bios = flash->virtual_memory; const unsigned int mask = getaddrmask(flash->chip);
bool shifted = (flash->chip->feature_bits & FEATURE_ADDR_SHIFTED); const chipaddr bios = flash->virtual_memory;
const bool shifted = (flash->chip->feature_bits & FEATURE_ADDR_SHIFTED);
unsigned int delay_us = 0; unsigned int delay_us = 0;
if ((addr != 0) || (blocksize != flash->chip->total_size * 1024)) {
msg_cerr("%s called with incorrect arguments\n",
__func__);
return -1;
}
if(flash->chip->probe_timing != TIMING_ZERO) if(flash->chip->probe_timing != TIMING_ZERO)
delay_us = 10; delay_us = 10;
@ -510,19 +518,6 @@ int write_jedec(struct flashctx *flash, const uint8_t *buf, unsigned int start,
return 0; return 0;
} }
/* erase chip with block_erase() prototype */
int erase_chip_block_jedec(struct flashctx *flash, unsigned int addr,
unsigned int blocksize)
{
const unsigned int mask = getaddrmask(flash->chip);
if ((addr != 0) || (blocksize != flash->chip->total_size * 1024)) {
msg_cerr("%s called with incorrect arguments\n",
__func__);
return -1;
}
return erase_chip_jedec_common(flash, mask);
}
int probe_jedec(struct flashctx *flash) int probe_jedec(struct flashctx *flash)
{ {
const unsigned int mask = getaddrmask(flash->chip); const unsigned int mask = getaddrmask(flash->chip);