Skip to content
Snippets Groups Projects
Commit 4e5eb458 authored by Lucas Stach's avatar Lucas Stach Committed by Tom Rini
Browse files

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: default avatarLucas Stach <dev@lynxeye.de>
Acked-by: default avatarSimon Glass <sjg@chromium.org>
Acked-by: default avatarAllen Martin <amartin@nvidia.com>
parent b6832af8
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment