diff options
| author | Lucas Stach <[email protected]> | 2013-01-22 00:15:49 +0000 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2013-01-31 14:46:40 -0500 |
| commit | ad394e027f32eb76f74bc4133446ae2e2b82dbfe (patch) | |
| tree | b067a0056e7d084c199c2ff318333d6a510dcf3c | |
| parent | 3a9d879f6f64585b819af728b53be0a05037fe0d (diff) | |
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]>
| -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 cfe32cc926d..9f861ccaf66 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 |