From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Glass Date: Sun, 9 Jul 2017 14:53:01 -0600 Subject: [U-Boot] [PATCH 18/30] env: Rename nand env_location to nand_env_location In-Reply-To: <20170709205313.116174-1-sjg@chromium.org> References: <20170709205313.116174-1-sjg@chromium.org> Message-ID: <20170709205313.116174-19-sjg@chromium.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 --- env/nand.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/env/nand.c b/env/nand.c index a67b5ad1ab..e9188539ca 100644 --- a/env/nand.c +++ b/env/nand.c @@ -153,12 +153,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) { int ret = 0; @@ -186,7 +186,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 = { -- 2.13.2.725.g09c95d1e9-goog