From: Tim Harvey <tharvey@gateworks.com>
Date: Tue, 24 May 2016 18:03:48 +0000 (-0700)
Subject: imx: ventana: SPL: only disable boot watchdog if Falcon mode
X-Git-Tag: v2016.07-rc2~49^2~22
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1b99103fba8f75337d36701f05bb0f656d2ff729;p=u-boot

imx: ventana: SPL: only disable boot watchdog if Falcon mode

If not booting Falcon mode, leave the boot watchdog enabled as a work-around
for other non-resolved bootloader hangs.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
---

diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index ed42b860aa..c045d74971 100644
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -527,9 +527,6 @@ void board_init_f(ulong dummy)
 
 	/* Clear the BSS. */
 	memset(__bss_start, 0, __bss_end - __bss_start);
-
-	/* disable boot watchdog */
-	gsc_boot_wd_disable();
 }
 
 /* called from board_init_r after gd setup if CONFIG_SPL_BOARD_INIT defined */
@@ -575,6 +572,9 @@ int spl_start_uboot(void)
 	i2c_set_bus_num(0);
 	gsc_i2c_read(0x50, 0x0, 1, &ret, 1);
 #endif
+	if (!ret)
+		gsc_boot_wd_disable();
+
 	debug("%s booting %s\n", __func__, ret ? "uboot" : "linux");
 	return ret;
 }