diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-04 12:22:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-04 12:22:43 -0400 |
| commit | 62861c70d3128680823fa091dcc2f6fee3bca30c (patch) | |
| tree | 1effa13c5319dcb55f5167d707d1662c0de9503b /env/common.c | |
| parent | 2baa731d0076b9aff721a2c737c479f65cc931e9 (diff) | |
| parent | d90fc9c3deb6a9941a9cd0ba764e9c74e5060186 (diff) | |
Merge branch '2019-10-04-master-imports'
- Assorted TI platform fixes
- Revert the change that broke environment flag validation
- Assorted typo fixes
- Assorted Kconfig dependency fixes
- Other minor bug fixes
Diffstat (limited to 'env/common.c')
| -rw-r--r-- | env/common.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/env/common.c b/env/common.c index 3fb60509dd8..4daaa6faea6 100644 --- a/env/common.c +++ b/env/common.c @@ -24,10 +24,7 @@ DECLARE_GLOBAL_DATA_PTR; #include <env_default.h> struct hsearch_data env_htab = { -#if CONFIG_IS_ENABLED(ENV_SUPPORT) - /* defined in flags.c, only compile with ENV_SUPPORT */ .change_ok = env_flags_validate, -#endif }; /* @@ -229,9 +226,7 @@ void env_relocate(void) #if defined(CONFIG_NEEDS_MANUAL_RELOC) env_reloc(); env_fix_drivers(); - - if (env_htab.change_ok) - env_htab.change_ok += gd->reloc_off; + env_htab.change_ok += gd->reloc_off; #endif if (gd->env_valid == ENV_INVALID) { #if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD) |