| Message ID | 20191004200024.21596-1-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | d90fc9c3deb6a9941a9cd0ba764e9c74e5060186 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,1/1] Revert "env: solve compilation error in SPL" | expand |
On Fri, Oct 04, 2019 at 04:00:24PM -0400, Tom Rini wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/env/common.c b/env/common.c index 3fb60509dd85..4daaa6faea60 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)
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> --- Here is what, sadly, is going to I feel be the most frustraiting part of the regression here. The problem that I'm sure was encountered during development that needed this change is not present in mainline. I've done my usual world build with this revert applied and the only changes are that the platforms that had a regression have their functionality back. env/common.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)