From: Lucas Stach <dev@lynxeye.de>
Date: Tue, 22 Jan 2013 00:15:49 +0000 (+0000)
Subject: arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README
X-Git-Tag: v2013.04-rc1~135
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4e5eb45898b6f05fef3a4690399726c03bc1f398;p=u-boot

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.

Signed-off-by: Lucas Stach <dev@lynxeye.de>
Acked-by: Simon Glass <sjg@chromium.org>
Acked-by: Allen Martin <amartin@nvidia.com>
---

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index cfe32cc926..9f861ccaf6 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -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