Since display5 is now supporting boot counting, we can just reset the
board when bootm fails (i.e. it doesn't boot the fitImage kernel for
any reason).

Signed-off-by: Lukasz Majewski <lu...@denx.de>
---

 include/configs/display5.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/configs/display5.h b/include/configs/display5.h
index 7689d54df9..9a11896c68 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -151,7 +151,7 @@
        "sf probe;" \
        "sf read ${loadaddr} swu-kernel;" \
        "sf read ${loadaddr_swu_initramfs} swu-initramfs;" \
-       "bootm ${loadaddr} ${loadaddr_swu_initramfs};"
+       "bootm ${loadaddr} ${loadaddr_swu_initramfs};reset;"
 
 #define KERNEL_RECOVERY_PROCEDURE \
        "echo '#######################';" \
@@ -159,7 +159,7 @@
        "echo '#######################';" \
        "sf probe;" \
        "sf read ${loadaddr} lin-recovery;" \
-       "bootm;"
+       "bootm;reset;"
 
 #define SETUP_BOOTARGS \
        "run set_rootfs_part;" \
@@ -315,7 +315,7 @@
        "if run download_kernel; then "   \
             "setenv bootargs console=${console} " \
             "root=/dev/mmcblk0p2 rootwait;" \
-            "bootm ${loadaddr} - ${fdtaddr};" \
+            "bootm ${loadaddr} - ${fdtaddr};reset;" \
        "fi\0" \
        "addip=setenv bootargs ${bootargs} " \
        "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
@@ -332,7 +332,7 @@
             "run addip;"         \
             "setenv bootargs ${bootargs} console=${console};"    \
             "setenv fdt_conf imx6q-${board}-${display}.dtb; " \
-            "bootm ${loadaddr}#conf@${fdt_conf};" \
+            "bootm ${loadaddr}#conf@${fdt_conf};reset;" \
        "fi\0" \
        "falcon_setup=" \
        "if mmc dev ${mmcdev}; then "     \
@@ -346,7 +346,7 @@
        "boot_mmc=" \
        "if mmc dev ${mmcdev}; then "     \
             SETUP_BOOTARGS \
-            "bootm ${loadaddr}#conf@${fdt_conf};" \
+            "bootm ${loadaddr}#conf@${fdt_conf};reset;" \
        "fi\0" \
        "set_kernel_part=" \
        "if test ${BOOT_FROM} = ACTIVE; then " \
-- 
2.11.0

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Reply via email to