From fd8e1c3866578d87ed14a04a59faae341fd415df Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Tue, 22 Jan 2013 00:15:49 +0000 Subject: [PATCH] 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 Acked-by: Simon Glass Acked-by: Allen Martin --- arch/arm/lib/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.39.5