Define env_ptr as static in flash and nand env driver to allow these to compile together.
Signed-off-by: Rajesh Bhagat rajesh.bhagat@nxp.com --- Change in v2: None
env/flash.c | 4 ++-- env/nand.c | 6 +++--- include/environment.h | 1 - 3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/env/flash.c b/env/flash.c index 32236c716e..33b199f05b 100644 --- a/env/flash.c +++ b/env/flash.c @@ -45,13 +45,13 @@ DECLARE_GLOBAL_DATA_PTR; #endif
#ifdef ENV_IS_EMBEDDED -env_t *env_ptr = &environment; +static env_t *env_ptr = &environment;
static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
#else /* ! ENV_IS_EMBEDDED */
-env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR; +static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR; static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR; #endif /* ENV_IS_EMBEDDED */
diff --git a/env/nand.c b/env/nand.c index 3698e68957..4d04bbb164 100644 --- a/env/nand.c +++ b/env/nand.c @@ -40,11 +40,11 @@ #endif
#if defined(ENV_IS_EMBEDDED) -env_t *env_ptr = &environment; +static env_t *env_ptr = &environment; #elif defined(CONFIG_NAND_ENV_DST) -env_t *env_ptr = (env_t *)CONFIG_NAND_ENV_DST; +static env_t *env_ptr = (env_t *)CONFIG_NAND_ENV_DST; #else /* ! ENV_IS_EMBEDDED */ -env_t *env_ptr; +static env_t *env_ptr; #endif /* ENV_IS_EMBEDDED */
DECLARE_GLOBAL_DATA_PTR; diff --git a/include/environment.h b/include/environment.h index 5e90f157e8..7da1291d5b 100644 --- a/include/environment.h +++ b/include/environment.h @@ -157,7 +157,6 @@ extern env_t environment; #endif /* ENV_IS_EMBEDDED */
extern const unsigned char default_environment[]; -extern env_t *env_ptr;
#if defined(CONFIG_NEEDS_MANUAL_RELOC) extern void env_reloc(void);