summaryrefslogtreecommitdiff
path: root/env
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2019-08-01 09:47:03 -0600
committerTom Rini <trini@konsulko.com>2019-08-11 16:43:41 -0400
commitbe54ec1624fb9a31b3fa30d55662d2c7b0832162 (patch)
treef6a622e0be34619ce7058af850c5048b34ad2fad /env
parentc62f62b0fccca951bdc91f3ab85f495fdcc0efb2 (diff)
downloadu-boot-be54ec1624fb9a31b3fa30d55662d2c7b0832162.tar.gz
env: Rename environment to embedded_environment
The name 'environment' is widely used in U-Boot so is not a very useful name of a variable. Rename it to better indicate its purpose. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Diffstat (limited to 'env')
-rw-r--r--env/flash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/env/flash.c b/env/flash.c
index dca6567a09..a26d94309d 100644
--- a/env/flash.c
+++ b/env/flash.c
@@ -47,7 +47,7 @@ DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_ENV_ADDR_REDUND) && defined(CMD_SAVEENV) || \
!defined(CONFIG_ENV_ADDR_REDUND) && defined(INITENV)
#ifdef ENV_IS_EMBEDDED
-static env_t *env_ptr = &environment;
+static env_t *env_ptr = &embedded_environment;
#else /* ! ENV_IS_EMBEDDED */
static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;