diff options
| author | Lucas Stach <dev@lynxeye.de> | 2013-01-22 00:15:49 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-01-30 19:33:01 -0500 |
| commit | 4e5eb45898b6f05fef3a4690399726c03bc1f398 (patch) | |
| tree | ba232563f95dc471a0a3475f8e96f0acdcd7a8d4 | |
| parent | b6832af85078e24308d2326fcc5b078484797c63 (diff) | |
| download | u-boot-imx-4e5eb45898b6f05fef3a4690399726c03bc1f398.zip u-boot-imx-4e5eb45898b6f05fef3a4690399726c03bc1f398.tar.gz u-boot-imx-4e5eb45898b6f05fef3a4690399726c03bc1f398.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.c | 2 |
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 |