aboutsummaryrefslogtreecommitdiffstats
path: root/env
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-08-03 12:21:57 -0600
committerTom Rini <trini@konsulko.com>2017-08-15 08:18:51 -0400
commit42a8180d19ad8f45b4639015050bc709caa4f32c (patch)
tree7cd316d0fc9653d48c53ee24d30cf554f3d7ea5c /env
parent203e94f6c9ca03e260175ce240f5856507395585 (diff)
downloadu-boot-midas-42a8180d19ad8f45b4639015050bc709caa4f32c.tar.gz
u-boot-midas-42a8180d19ad8f45b4639015050bc709caa4f32c.tar.bz2
u-boot-midas-42a8180d19ad8f45b4639015050bc709caa4f32c.zip
env: Rename nand env_location to nand_env_location
We want to use this name for all environment drivers. Update the nand driver to use a more specific name. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'env')
-rw-r--r--env/nand.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/env/nand.c b/env/nand.c
index 90f274bf8a..d1b8b26999 100644
--- a/env/nand.c
+++ b/env/nand.c
@@ -158,12 +158,12 @@ static int writeenv(size_t offset, u_char *buf)
return 0;
}
-struct env_location {
+struct nand_env_location {
const char *name;
const nand_erase_options_t erase_opts;
};
-static int erase_and_write_env(const struct env_location *location,
+static int erase_and_write_env(const struct nand_env_location *location,
u_char *env_new)
{
struct mtd_info *mtd;
@@ -189,7 +189,7 @@ int saveenv(void)
int ret = 0;
ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1);
int env_idx = 0;
- static const struct env_location location[] = {
+ static const struct nand_env_location location[] = {
{
.name = "NAND",
.erase_opts = {