| commit | e7152ba1a77287a3112bad0855a1d3588a93ea6e | [log] [tgz] |
|---|---|---|
| author | Tom Rini <trini@konsulko.com> | Tue Oct 18 10:20:26 2016 -0400 |
| committer | Tom Rini <trini@konsulko.com> | Tue Oct 18 10:20:26 2016 -0400 |
| tree | a37b0d2af3d94480f372129e6aac53dba366937f | |
| parent | 982ca46a7842a21b2a84120102d3b520fc4f5a0c [diff] | |
| parent | 70785638d3157be56960b156cb86f00783bf876b [diff] |
Merge git://git.denx.de/u-boot-x86
diff --git a/common/console.c b/common/console.c index c7f3243..f38f71f 100644 --- a/common/console.c +++ b/common/console.c
@@ -16,6 +16,7 @@ #include <stdio_dev.h> #include <exports.h> #include <environment.h> +#include <watchdog.h> DECLARE_GLOBAL_DATA_PTR; @@ -294,6 +295,7 @@ * Effectively poll for input wherever it may be available. */ for (;;) { + WATCHDOG_RESET(); /* * Upper layer may have already called tstc() so * check for that first.