]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
bootcount: display5: spl: Extend DISPLAY5 board SPL to support bootcount checking
authorLukasz Majewski <lukma@denx.de>
Wed, 2 May 2018 14:10:55 +0000 (16:10 +0200)
committerTom Rini <trini@konsulko.com>
Fri, 11 May 2018 00:38:32 +0000 (20:38 -0400)
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>
board/liebherr/display5/spl.c

index 49bcafef7473afe4993344e3b359b66e724de47e..6508e0ffa7dfa3c0e1e75145769175dfc9cf6631 100644 (file)
@@ -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();
        }