diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-10 17:12:52 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-10 17:19:59 -0500 |
| commit | d94604d558cda9f89722c967d6f8d6269a2db21c (patch) | |
| tree | 2ccba6dac6920892a2075ab6d0f2b7e6d99c1cb5 /env/nand.c | |
| parent | 2918f58faa565bcf89ac8c9e827a2e290ea96f55 (diff) | |
| parent | 4909b89ec763f0c7030fa8474f9b6c5df866b01f (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/nand.c')
| -rw-r--r-- | env/nand.c | 6 |
1 files changed, 2 insertions, 4 deletions
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; |