aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2013-01-22 00:15:49 +0000
committerTom Rini <trini@ti.com>2013-01-31 14:46:40 -0500
commitad394e027f32eb76f74bc4133446ae2e2b82dbfe (patch)
treeb067a0056e7d084c199c2ff318333d6a510dcf3c
parent3a9d879f6f64585b819af728b53be0a05037fe0d (diff)
downloadu-boot-linaro-stable-ad394e027f32eb76f74bc4133446ae2e2b82dbfe.tar.gz
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>
-rw-r--r--arch/arm/lib/board.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index cfe32cc92..9f861ccaf 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