diff options
| author | Lukasz Majewski <lukma@denx.de> | 2018-05-11 16:51:03 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2018-06-18 15:42:38 +0200 |
| commit | e087905a48ee8042ffdd9531b6aada6be2751ed1 (patch) | |
| tree | d8b5d39d3cd6bb906cc99e856b4fe7561d6f2b27 /board/liebherr | |
| parent | 2f4372a101c235c6cf2b337df4c989e540b1b3e4 (diff) | |
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>
Diffstat (limited to 'board/liebherr')
| -rw-r--r-- | board/liebherr/display5/spl.c | 4 |
1 files 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) { |