From 7bf4ed9277bb724e9a9aac762dc69f3e3c48f748 Mon Sep 17 00:00:00 2001
From: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Date: Sun, 26 Aug 2012 21:04:27 +0000
Subject: [PATCH] Rename AT25F512B-specific code
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.
Corresponding to flashrom svn r1583.
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
---
at25.c | 4 ++--
chipdrivers.h | 4 ++--
flashchips.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/at25.c b/at25.c
index 817e769..803e7e4 100644
--- a/at25.c
+++ b/at25.c
@@ -86,7 +86,7 @@ int spi_prettyprint_status_register_at25df_sec(struct flashctx *flash)
return spi_prettyprint_status_register_at25df(flash);
}
-int spi_prettyprint_status_register_at25f(struct flashctx *flash)
+int spi_prettyprint_status_register_at25f512b(struct flashctx *flash)
{
uint8_t status;
@@ -202,7 +202,7 @@ int spi_disable_blockprotect_at25df_sec(struct flashctx *flash)
return spi_disable_blockprotect_at25df(flash);
}
-int spi_disable_blockprotect_at25f(struct flashctx *flash)
+int spi_disable_blockprotect_at25f512b(struct flashctx *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 0c78b0d..b43e16e 100644
--- a/chipdrivers.h
+++ b/chipdrivers.h
@@ -77,13 +77,13 @@ int spi_prettyprint_status_register_amic_a25lq032(struct flashctx *flash);
/* at25.c */
int spi_prettyprint_status_register_at25df(struct flashctx *flash);
int spi_prettyprint_status_register_at25df_sec(struct flashctx *flash);
-int spi_prettyprint_status_register_at25f(struct flashctx *flash);
+int spi_prettyprint_status_register_at25f512b(struct flashctx *flash);
int spi_prettyprint_status_register_at25fs010(struct flashctx *flash);
int spi_prettyprint_status_register_at25fs040(struct flashctx *flash);
int spi_prettyprint_status_register_atmel_at26df081a(struct flashctx *flash);
int spi_disable_blockprotect_at25df(struct flashctx *flash);
int spi_disable_blockprotect_at25df_sec(struct flashctx *flash);
-int spi_disable_blockprotect_at25f(struct flashctx *flash);
+int spi_disable_blockprotect_at25f512b(struct flashctx *flash);
int spi_disable_blockprotect_at25fs010(struct flashctx *flash);
int spi_disable_blockprotect_at25fs040(struct flashctx *flash);
diff --git a/flashchips.c b/flashchips.c
index 789f17f..f658b4c 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -1697,8 +1697,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},
--
GitLab