summaryrefslogtreecommitdiff
path: root/tools
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 /tools
parentc62f62b0fccca951bdc91f3ab85f495fdcc0efb2 (diff)
downloadu-boot-be54ec1624fb9a31b3fa30d55662d2c7b0832162.tar.gz
u-boot-be54ec1624fb9a31b3fa30d55662d2c7b0832162.tar.bz2
u-boot-be54ec1624fb9a31b3fa30d55662d2c7b0832162.zip
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 'tools')
-rw-r--r--tools/envcrc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/envcrc.c b/tools/envcrc.c
index 505949289f..7eb7246d45 100644
--- a/tools/envcrc.c
+++ b/tools/envcrc.c
@@ -61,7 +61,7 @@
#ifdef CONFIG_BUILD_ENVCRC
# include <environment.h>
extern unsigned int env_size;
-extern env_t environment;
+extern env_t embedded_environment;
#endif /* CONFIG_BUILD_ENVCRC */
extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int);
@@ -71,7 +71,7 @@ int main (int argc, char **argv)
#ifdef CONFIG_BUILD_ENVCRC
unsigned char pad = 0x00;
uint32_t crc;
- unsigned char *envptr = (unsigned char *)&environment,
+ unsigned char *envptr = (unsigned char *)&embedded_environment,
*dataptr = envptr + ENV_HEADER_SIZE;
unsigned int datasize = ENV_SIZE;
unsigned int eoe;