From: Lukasz Majewski <lukma@denx.de>
Date: Wed, 2 May 2018 14:10:55 +0000 (+0200)
Subject: bootcount: display5: spl: Extend DISPLAY5 board SPL to support bootcount checking
X-Git-Tag: v2018.07-rc1~172
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2dbd5cd966a485becf8ef2286c56aeb709877c8d;p=oweals%2Fu-boot.git

bootcount: display5: spl: Extend DISPLAY5 board SPL to support bootcount checking

This patch is necessary for providing basic bootcount checking in the case
of using "falcon" boot mode in that board.

It forces u-boot proper boot, when we exceed the number of errors.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Stefan Roese <sr@denx.de>
---

diff --git a/board/liebherr/display5/spl.c b/board/liebherr/display5/spl.c
index 49bcafef74..6508e0ffa7 100644
--- a/board/liebherr/display5/spl.c
+++ b/board/liebherr/display5/spl.c
@@ -19,6 +19,7 @@
 #include <environment.h>
 #include <fsl_esdhc.h>
 #include <netdev.h>
+#include <bootcount.h>
 #include "common.h"
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -213,7 +214,7 @@ void board_boot_order(u32 *spl_boot_list)
 	env_load();
 
 	s = env_get("BOOT_FROM");
-	if (s && strcmp(s, "ACTIVE") == 0) {
+	if (s && !bootcount_error() && strcmp(s, "ACTIVE") == 0) {
 		spl_boot_list[0] = BOOT_DEVICE_MMC1;
 		spl_boot_list[1] = spl_boot_device();
 	}