Skip to contentSkip to conversation

arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README

PATCH New Lucas Stach 5 participants 7 messages Jan 22, 2013 – Jan 31, 2013 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README

No one expects to end up in a delayed environment if CONFIG_DELAY_ENVIRONMENT isn't defined.

---
v2: keep preference of CONFIG_OF_CONTROL and just change default value

---
 arch/arm/lib/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/lib/board.c +1 -1
index cfe32cc..9f861cc 100644
@@ -488,7 +488,7 @@ static char *failed = "*** failed ***\n";
 static int should_load_env(void)
 {
 #ifdef CONFIG_OF_CONTROL
-	return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 0);
+	return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 1);
 #elif defined CONFIG_DELAY_ENVIRONMENT
 	return 0;
 #else
Signature · 1 line
1.8.0.2
#1 lore raw

PATCH v2 1/1 arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README

Quoted 4 lines · Lucas Stach

No one expects to end up in a delayed environment if CONFIG_DELAY_ENVIRONMENT isn't defined.

Good with me, and solves the immediate problem. Thanks for doing the patch.

Quoted 22 lines

---
v2: keep preference of CONFIG_OF_CONTROL and just change default value

---
 arch/arm/lib/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/lib/board.c +1 -2
index cfe32cc..9f861cc 100644
@@ -488,7 +488,7 @@ static char *failed = "*** failed ***\n";
 static int should_load_env(void)
 {
 #ifdef CONFIG_OF_CONTROL
-       return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 0);
+       return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 1);
 #elif defined CONFIG_DELAY_ENVIRONMENT
        return 0;
 #else
--

1.8.0.2

#2 lore raw

PATCH v2 1/1 arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README

Quoted 10 lines · Simon Glass
Quoted 4 lines · Lucas Stach

No one expects to end up in a delayed environment if CONFIG_DELAY_ENVIRONMENT isn't defined.

Good with me, and solves the immediate problem. Thanks for doing the patch.

Adding Tom Rini and Albert. What's the best way to get this up to u-boot/master as quickly as possible? Environment is broken on all boards that use fdt until this goes in.

-Allen

Quoted 26 lines
Quoted 20 lines

---
v2: keep preference of CONFIG_OF_CONTROL and just change default value

---
 arch/arm/lib/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/lib/board.c +1 -2
index cfe32cc..9f861cc 100644
@@ -488,7 +488,7 @@ static char *failed = "*** failed ***\n";
 static int should_load_env(void)
 {
 #ifdef CONFIG_OF_CONTROL
-       return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 0);
+       return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 1);
 #elif defined CONFIG_DELAY_ENVIRONMENT
        return 0;
 #else
--
Quoted 2 lines

1.8.0.2

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Signature · 1 line
nvpublic
#3 lore raw

PATCH v2 1/1 arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README

Quoted 7 lines · Allen Martin
Quoted 6 lines · Simon Glass
Quoted 4 lines · Lucas Stach

No one expects to end up in a delayed environment if CONFIG_DELAY_ENVIRONMENT isn't defined.

Quoted 8 lines
Quoted 4 lines

Good with me, and solves the immediate problem. Thanks for doing the patch.

Adding Tom Rini and Albert. What's the best way to get this up to u-boot/master as quickly as possible? Environment is broken on all boards that use fdt until this goes in.

I can just grab this directly since everyone is happy. now.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130130/79250526/attachment-0001.pgp>
#4 lore raw

PATCH v2 1/1 arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README

Quoted 12 lines · Tom Rini

* PGP Signed by an unknown key

Quoted 9 lines · Allen Martin
Quoted 8 lines · Simon Glass
Quoted 4 lines · Lucas Stach

No one expects to end up in a delayed environment if CONFIG_DELAY_ENVIRONMENT isn't defined.

Good with me, and solves the immediate problem. Thanks for doing the patch.

Quoted 9 lines
Quoted 6 lines
Quoted 2 lines

Adding Tom Rini and Albert. What's the best way to get this up to u-boot/master as quickly as possible? Environment is broken on all boards that use fdt until this goes in.

I can just grab this directly since everyone is happy. now.

That would be great, thanks!

-Allen

Signature · 1 line
nvpublic
#5 lore raw

PATCH v2 1/1 arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README

In reply to Lucas Stach
Quoted 30 lines · Lucas Stach

No one expects to end up in a delayed environment if CONFIG_DELAY_ENVIRONMENT isn't defined.

---
v2: keep preference of CONFIG_OF_CONTROL and just change default value

---
 arch/arm/lib/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/lib/board.c +1 -1
index cfe32cc..9f861cc 100644
@@ -488,7 +488,7 @@ static char *failed = "*** failed ***\n";
 static int should_load_env(void)
 {
 #ifdef CONFIG_OF_CONTROL
-	return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 0);
+	return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 1);
 #elif defined CONFIG_DELAY_ENVIRONMENT
 	return 0;
 #else
Signature · 6 lines
1.8.0.2

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Tested on tegra20 trimslice

Signature · 1 line
nvpublic