From b6cba297affba968a8d8465655c71cb3ec8a9bde Mon Sep 17 00:00:00 2001 From: Rajesh Bhagat Date: Mon, 5 Nov 2018 18:01:10 +0000 Subject: env: allow flash and nand env driver to compile together Define env_ptr as static in flash and nand env driver to allow these to compile together. Signed-off-by: Rajesh Bhagat Reviewed-by: York Sun --- env/nand.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'env/nand.c') diff --git a/env/nand.c b/env/nand.c index 3698e689571..29eda66fad8 100644 --- a/env/nand.c +++ b/env/nand.c @@ -40,11 +40,9 @@ #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; -#else /* ! ENV_IS_EMBEDDED */ -env_t *env_ptr; +static env_t *env_ptr = (env_t *)CONFIG_NAND_ENV_DST; #endif /* ENV_IS_EMBEDDED */ DECLARE_GLOBAL_DATA_PTR; -- cgit v1.2.3