Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ad394e027f32eb76f74bc4133446ae2e2b82dbfe

Authored by Lucas Stach
Committed by Tom Rini
1 parent 3a9d879f6f
Exists in u-boot-2013.01.y

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>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

arch/arm/lib/board.c
Diff comments   View file @ ad394e0
... ... @@ -488,7 +488,7 @@
488 488 static int should_load_env(void)
489 489 {
490 490 #ifdef CONFIG_OF_CONTROL
491   - return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 0);
  491 + return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 1);
492 492 #elif defined CONFIG_DELAY_ENVIRONMENT
493 493 return 0;
494 494 #else