Edward O'Callaghan has uploaded this change for review.
chipdrivers: Rename s/erase_chip_block_jedec/jedec_chip_block_erase
Change-Id: I3a2d370ec8d997689fdc921f1d3d7191b7c6cd1d
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
---
M flashrom.c
M include/chipdrivers.h
M jedec.c
3 files changed, 13 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/flashrom refs/changes/49/69049/1
diff --git a/flashrom.c b/flashrom.c
index a05dac0..6c9dbd0 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -360,7 +360,7 @@
case S25FS_BLOCK_ERASE_D8: return &s25fs_block_erase_d8;
case JEDEC_SECTOR_ERASE: return &erase_sector_jedec; // TODO rename to &jedec_sector_erase;
case JEDEC_BLOCK_ERASE: return &erase_block_jedec; // TODO rename to &jedec_block_erase;
- case JEDEC_CHIP_BLOCK_ERASE: return &erase_chip_block_jedec; // TODO rename to &jedec_chip_block_erase;
+ case JEDEC_CHIP_BLOCK_ERASE: return &jedec_chip_block_erase;
case OPAQUE_ERASE: return &opqaue_erase;
case SPI_ERASE_AT45CS_SECTOR: return &spi_erase_at45cs_sector;
case SPI_ERASE_AT45DB_BLOCK: return &spi_erase_at45db_block;
diff --git a/include/chipdrivers.h b/include/chipdrivers.h
index 657c902..6c27cb3 100644
--- a/include/chipdrivers.h
+++ b/include/chipdrivers.h
@@ -148,7 +148,7 @@
int write_jedec_1(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
int erase_sector_jedec(struct flashctx *flash, unsigned int page, unsigned int pagesize);
int erase_block_jedec(struct flashctx *flash, unsigned int page, unsigned int blocksize);
-int erase_chip_block_jedec(struct flashctx *flash, unsigned int page, unsigned int blocksize);
+int jedec_chip_block_erase(struct flashctx *flash, unsigned int page, unsigned int blocksize);
int unlock_regspace2_uniform_32k(struct flashctx *flash);
int unlock_regspace2_uniform_64k(struct flashctx *flash);
diff --git a/jedec.c b/jedec.c
index c4ee0c7..5cba398 100644
--- a/jedec.c
+++ b/jedec.c
@@ -515,7 +515,7 @@
}
/* erase chip with block_erase() prototype */
-int erase_chip_block_jedec(struct flashctx *flash, unsigned int addr,
+int jedec_chip_block_erase(struct flashctx *flash, unsigned int addr,
unsigned int blocksize)
{
unsigned int mask;
To view, visit change 69049. To unsubscribe, or for help writing mail filters, visit settings.