summaryrefslogtreecommitdiff
path: root/include
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 /include
parentc62f62b0fccca951bdc91f3ab85f495fdcc0efb2 (diff)
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 'include')
-rw-r--r--include/env_default.h2
-rw-r--r--include/environment.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/env_default.h b/include/env_default.h
index 86b639d3e28..56a8bae39a0 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -10,7 +10,7 @@
#include <env_callback.h>
#ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
-env_t environment __UBOOT_ENV_SECTION__(environment) = {
+env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = {
ENV_CRC, /* CRC Sum */
#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
1, /* Flags: valid */
diff --git a/include/environment.h b/include/environment.h
index d23b92833e4..44a527e1fa1 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -153,7 +153,7 @@ typedef struct environment_s {
} env_t;
#ifdef ENV_IS_EMBEDDED
-extern env_t environment;
+extern env_t embedded_environment;
#endif /* ENV_IS_EMBEDDED */
extern const unsigned char default_environment[];