Skip to contentSkip to conversation

Revert "env: solve compilation error in SPL"

PATCH New Tom Rini 1 participant 2 messages Oct 4, 2019 – Oct 6, 2019

lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 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.

---
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(-)
env/common.c +1 -6
index 3fb60509dd85..4daaa6faea60 100644
@@ -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)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/1 Revert "env: solve compilation error in SPL"

Quoted 5 lines · Tom Rini

This reverts commit 7d4776545b0f8a8827e5d061206faf61c9ba6ea9. The changes here break environment validation and furthermore do not seem to be required.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191005/ec1bed1f/attachment.sig>