diff mbox series

[U-Boot,v1,05/21] display5: spl: Check return code of the env_* functions

Message ID 20180511145119.20942-6-lukma@denx.de
State Accepted
Commit e087905a48ee8042ffdd9531b6aada6be2751ed1
Delegated to: Stefano Babic
Headers show
Series This patch series brings in sync DISPLAY5 internal | expand

Commit Message

Lukasz Majewski May 11, 2018, 2:51 p.m. UTC 
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 mbox series

Patch

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) {