Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "env: solve compilation error in SPL"

Browse source 
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:
Tom Rini 2019-10-04 12:21:33 -04:00
parent 5ff1963da3
commit d90fc9c3de
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
env/common.c vendored
View file

@ -24,10 +24,7 @@ DECLARE_GLOBAL_DATA_PTR;
#include <env_default.h> #include <env_default.h>
struct hsearch_data env_htab = { 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, .change_ok = env_flags_validate,
#endif
}; };
/* /*
@ -229,9 +226,7 @@ void env_relocate(void)
#if defined(CONFIG_NEEDS_MANUAL_RELOC) #if defined(CONFIG_NEEDS_MANUAL_RELOC)
env_reloc(); env_reloc();
env_fix_drivers(); env_fix_drivers();
env_htab.change_ok += gd->reloc_off;
if (env_htab.change_ok)
env_htab.change_ok += gd->reloc_off;
#endif #endif
if (gd->env_valid == ENV_INVALID) { if (gd->env_valid == ENV_INVALID) {
#if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD) #if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD)