[U-Boot] [PATCH] arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README

[Lucas Stach <dev@lynxeye.de>]

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>
---
 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
-- 
1.8.0.2