From e087905a48ee8042ffdd9531b6aada6be2751ed1 Mon Sep 17 00:00:00 2001
From: Lukasz Majewski <lukma@denx.de>
Date: Fri, 11 May 2018 16:51:03 +0200
Subject: [PATCH] display5: spl: Check return code of the env_* functions
Force booting through u-boot proper when environment error encountered
(as a result of either broken SPI-NOR or erased envs).
Signed-off-by: Lukasz Majewski <lukma@denx.de>
---
board/liebherr/display5/spl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index 6508e0ffa7..0d25b0d996 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -210,8 +210,8 @@ void board_boot_order(u32 *spl_boot_list)
/* 'fastboot' */
const char *s;
- env_init();
- env_load();
+ if (env_init() || env_load())
+ return;
s = env_get("BOOT_FROM");
if (s && !bootcount_error() && strcmp(s, "ACTIVE") == 0) {
--
2.39.5