Revert "env: solve compilation error in SPL"
This reverts commit 7d4776545b
. The
changes here break environment validation and furthermore do not seem to
be required.
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
parent
5ff1963da3
commit
d90fc9c3de
7
env/common.c
vendored
7
env/common.c
vendored
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user