From patchwork Tue Jan 22 00:22:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [U-Boot] arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README Date: Mon, 21 Jan 2013 14:22:38 -0000 From: Lucas Stach X-Patchwork-Id: 214300 Message-Id: <1358814158-5264-1-git-send-email-dev@lynxeye.de> To: u-boot@lists.denx.de No one expects to end up in a delayed environment if CONFIG_DELAY_ENVIRONMENT isn't defined. Signed-off-by: Lucas Stach --- arch/arm/lib/board.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index cfe32cc..1a32611 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -487,10 +487,12 @@ static char *failed = "*** failed ***\n"; */ static int should_load_env(void) { +#ifdef CONFIG_DELAY_ENVIRONMENT #ifdef CONFIG_OF_CONTROL return fdtdec_get_config_int(gd->fdt_blob, "load-environment", 0); -#elif defined CONFIG_DELAY_ENVIRONMENT +#else return 0; +#endif #else return 1; #endif