diff options
| author | Tim Harvey <tharvey@gateworks.com> | 2016-05-24 11:03:48 -0700 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2016-05-31 17:23:46 +0200 |
| commit | 1b99103fba8f75337d36701f05bb0f656d2ff729 (patch) | |
| tree | be16a683e6e2a0ed8b5bae73fe579956a6c28ac7 /board | |
| parent | 899f589bcd3e0f97efa07b112f0d1d5c419b72b5 (diff) | |
| download | talos-obmc-uboot-1b99103fba8f75337d36701f05bb0f656d2ff729.tar.gz talos-obmc-uboot-1b99103fba8f75337d36701f05bb0f656d2ff729.zip | |
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>
Diffstat (limited to 'board')
| -rw-r--r-- | board/gateworks/gw_ventana/gw_ventana_spl.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; } |
