summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Stach <dev@lynxeye.de>2013-01-22 00:15:49 +0000
committerTom Warren <twarren@nvidia.com>2013-02-11 10:35:26 -0700
commitfd8e1c3866578d87ed14a04a59faae341fd415df (patch)
tree69410319c9ae4f6856e476a905dcc71b0fbc9514
parent07067145dee374e970ffc033cff76982e8cf2e19 (diff)
downloadu-boot-imx-fd8e1c3866578d87ed14a04a59faae341fd415df.zip
u-boot-imx-fd8e1c3866578d87ed14a04a59faae341fd415df.tar.gz
u-boot-imx-fd8e1c3866578d87ed14a04a59faae341fd415df.tar.bz2
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 cfe32cc..9f861cc 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