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 <[email protected]>
Acked-by: Simon Glass <[email protected]>
Acked-by: Allen Martin <[email protected]>

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index cfe32cc926d502e470d23ec092f827e29c91cf0f..9f861ccaf6693364f76f78d9c66fbb7c605bcce5 100644 (file)
--- 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