diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-04 12:21:33 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-04 12:21:33 -0400 |
| commit | d90fc9c3deb6a9941a9cd0ba764e9c74e5060186 (patch) | |
| tree | 0f76e5af48ab43faef94572da77c568ee55456fb | |
| parent | 5ff1963da31767521cbb755c0aa1f8ed2e361efd (diff) | |
Revert "env: solve compilation error in SPL"
This reverts commit 7d4776545b0f8a8827e5d061206faf61c9ba6ea9. The
changes here break environment validation and furthermore do not seem to
be required.
Signed-off-by: Tom Rini <trini@konsulko.com>
| -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 3fb60509dd..4daaa6faea 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) |