diff options
| author | Tom Rini <[email protected]> | 2019-08-12 18:46:07 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-08-12 18:46:07 -0400 |
| commit | 5939afc9611e8ba4a86b96e67670b765ee27668e (patch) | |
| tree | 369402e0305a7b8f9f905baec6387bfd9683ba71 /include/env_default.h | |
| parent | d7ae932152ddf58125a05f4eb28596d9b31bdb1e (diff) | |
| parent | ec1fa18561f818bee252da2c331d371ad26037d2 (diff) | |
Merge branch '2019-08-11-master-imports'
- environment cleanup
- HiKey 960 support
- Some PCI fixes
Diffstat (limited to 'include/env_default.h')
| -rw-r--r-- | include/env_default.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/env_default.h b/include/env_default.h index 86b639d3e28..56a8bae39a0 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -10,7 +10,7 @@ #include <env_callback.h> #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED -env_t environment __UBOOT_ENV_SECTION__(environment) = { +env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = { ENV_CRC, /* CRC Sum */ #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT 1, /* Flags: valid */ |