dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-30 06:51:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

env: Rename environment to embedded_environment

Browse Source 
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>
This commit is contained in:
Simon Glass
2019-08-01 09:47:03 -06:00
committed by Tom Rini
parent c62f62b0fc
commit be54ec1624
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
env/flash.c vendored
View File

@@ -47,7 +47,7 @@ DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_ENV_ADDR_REDUND) && defined(CMD_SAVEENV) || \ #if defined(CONFIG_ENV_ADDR_REDUND) && defined(CMD_SAVEENV) || \
!defined(CONFIG_ENV_ADDR_REDUND) && defined(INITENV) !defined(CONFIG_ENV_ADDR_REDUND) && defined(INITENV)
#ifdef ENV_IS_EMBEDDED #ifdef ENV_IS_EMBEDDED
static env_t *env_ptr = &environment; static env_t *env_ptr = &embedded_environment;
#else /* ! ENV_IS_EMBEDDED */ #else /* ! ENV_IS_EMBEDDED */
static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR; static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;

2
include/env_default.h
View File

@@ -10,7 +10,7 @@
#include <env_callback.h> #include <env_callback.h>
#ifdef DEFAULT_ENV_INSTANCE_EMBEDDED #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
env_t environment __UBOOT_ENV_SECTION__(environment) = { env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = {
ENV_CRC, /* CRC Sum */ ENV_CRC, /* CRC Sum */
#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
1, /* Flags: valid */ 1, /* Flags: valid */

2
include/environment.h
View File

@@ -153,7 +153,7 @@ typedef struct environment_s {
} env_t; } env_t;
#ifdef ENV_IS_EMBEDDED #ifdef ENV_IS_EMBEDDED
extern env_t environment; extern env_t embedded_environment;
#endif /* ENV_IS_EMBEDDED */ #endif /* ENV_IS_EMBEDDED */
extern const unsigned char default_environment[]; extern const unsigned char default_environment[];

4
tools/envcrc.c
View File

@@ -61,7 +61,7 @@
#ifdef CONFIG_BUILD_ENVCRC #ifdef CONFIG_BUILD_ENVCRC
# include <environment.h> # include <environment.h>
extern unsigned int env_size; extern unsigned int env_size;
extern env_t environment; extern env_t embedded_environment;
#endif /* CONFIG_BUILD_ENVCRC */ #endif /* CONFIG_BUILD_ENVCRC */
extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int); 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 #ifdef CONFIG_BUILD_ENVCRC
unsigned char pad = 0x00; unsigned char pad = 0x00;
uint32_t crc; uint32_t crc;
unsigned char *envptr = (unsigned char *)&environment, unsigned char *envptr = (unsigned char *)&embedded_environment,
*dataptr = envptr + ENV_HEADER_SIZE; *dataptr = envptr + ENV_HEADER_SIZE;
unsigned int datasize = ENV_SIZE; unsigned int datasize = ENV_SIZE;
unsigned int eoe; unsigned int eoe;