[flashrom] [PATCH 2/4] rename AT25F512B-specific code
Stefan Tauner
stefan.tauner at student.tuwien.ac.at
Fri Jul 29 14:56:54 CEST 2011
The AT25F512B is quite different from the other (older and yet
unsupported) chips in the AT25F* familiy, hence rename 512B-specific
stuff to make room for the generic AT25F* code
Signed-off-by: Stefan Tauner <stefan.tauner at student.tuwien.ac.at>
---
at25.c | 4 ++--
chipdrivers.h | 4 ++--
flashchips.c | 5 +++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/at25.c b/at25.c
index d6b46ca..e4bd729 100644
--- a/at25.c
+++ b/at25.c
@@ -86,7 +86,7 @@ int spi_prettyprint_status_register_at25df_sec(struct flashchip *flash)
return spi_prettyprint_status_register_at25df(flash);
}
-int spi_prettyprint_status_register_at25f(struct flashchip *flash)
+int spi_prettyprint_status_register_at25f512b(struct flashchip *flash)
{
uint8_t status;
@@ -201,7 +201,7 @@ int spi_disable_blockprotect_at25df_sec(struct flashchip *flash)
return spi_disable_blockprotect_at25df(flash);
}
-int spi_disable_blockprotect_at25f(struct flashchip *flash)
+int spi_disable_blockprotect_at25f512b(struct flashchip *flash)
{
/* spi_disable_blockprotect_at25df is not really the right way to do
* this, but the side effects of said function work here as well.
diff --git a/chipdrivers.h b/chipdrivers.h
index a0b0387..ccbd86b 100644
--- a/chipdrivers.h
+++ b/chipdrivers.h
@@ -65,13 +65,13 @@ int spi_prettyprint_status_register_amic_a25lq032(struct flashchip *flash);
/* at25.c */
int spi_prettyprint_status_register_at25df(struct flashchip *flash);
int spi_prettyprint_status_register_at25df_sec(struct flashchip *flash);
-int spi_prettyprint_status_register_at25f(struct flashchip *flash);
+int spi_prettyprint_status_register_at25f512b(struct flashchip *flash);
int spi_prettyprint_status_register_at25fs010(struct flashchip *flash);
int spi_prettyprint_status_register_at25fs040(struct flashchip *flash);
int spi_prettyprint_status_register_atmel_at26df081a(struct flashchip *flash);
int spi_disable_blockprotect_at25df(struct flashchip *flash);
int spi_disable_blockprotect_at25df_sec(struct flashchip *flash);
-int spi_disable_blockprotect_at25f(struct flashchip *flash);
+int spi_disable_blockprotect_at25f512b(struct flashchip *flash);
int spi_disable_blockprotect_at25fs010(struct flashchip *flash);
int spi_disable_blockprotect_at25fs040(struct flashchip *flash);
diff --git a/flashchips.c b/flashchips.c
index a040e8c..0020f6f 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -1657,6 +1657,7 @@ const struct flashchip flashchips[] = {
.model_id = ATMEL_AT25F512B,
.total_size = 64,
.page_size = 256,
+ /* TODO: chip features 128-byte one-time programmable region */
.feature_bits = FEATURE_WRSR_WREN,
.tested = TEST_UNTESTED,
.probe = probe_spi_rdid,
@@ -1680,8 +1681,8 @@ const struct flashchip flashchips[] = {
.block_erase = spi_block_erase_c7,
}
},
- .printlock = spi_prettyprint_status_register_at25f,
- .unlock = spi_disable_blockprotect_at25f,
+ .printlock = spi_prettyprint_status_register_at25f512b,
+ .unlock = spi_disable_blockprotect_at25f512b,
.write = spi_chip_write_256,
.read = spi_chip_read,
.voltage = {2700, 3600},
--
1.7.1
More information about the flashrom
mailing list