summaryrefslogtreecommitdiff
path: root/env/flash.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-12-10 17:12:52 -0500
committerTom Rini <trini@konsulko.com>2018-12-10 17:19:59 -0500
commitd94604d558cda9f89722c967d6f8d6269a2db21c (patch)
tree2ccba6dac6920892a2075ab6d0f2b7e6d99c1cb5 /env/flash.c
parent2918f58faa565bcf89ac8c9e827a2e290ea96f55 (diff)
parent4909b89ec763f0c7030fa8474f9b6c5df866b01f (diff)
Merge tag 'fsl-qoriq-for-v2019.01-rc2' of git://git.denx.de/u-boot-fsl-qoriq
Add TFA boot flow for some Layerscape platforms Add support for lx2160a SoC [trini: Add a bunch of missing MAINTAINERS entries] Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'env/flash.c')
-rw-r--r--env/flash.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/env/flash.c b/env/flash.c
index 32236c716ec..dca6567a097 100644
--- a/env/flash.c
+++ b/env/flash.c
@@ -44,16 +44,16 @@ DECLARE_GLOBAL_DATA_PTR;
#define INITENV
#endif
+#if defined(CONFIG_ENV_ADDR_REDUND) && defined(CMD_SAVEENV) || \
+ !defined(CONFIG_ENV_ADDR_REDUND) && defined(INITENV)
#ifdef ENV_IS_EMBEDDED
-env_t *env_ptr = &environment;
-
-static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
-
+static env_t *env_ptr = &environment;
#else /* ! ENV_IS_EMBEDDED */
-env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
-static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
+static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
#endif /* ENV_IS_EMBEDDED */
+#endif
+static __maybe_unused env_t *flash_addr = (env_t *)CONFIG_ENV_ADDR;
/* CONFIG_ENV_ADDR is supposed to be on sector boundary */
static ulong __maybe_unused end_addr =