summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2010-09-08 15:35:31 +0200
committerWolfgang Denk <wd@denx.de>2010-10-12 21:16:01 +0200
commitbe4424c73d3a0994c5fabc34900fb7101f6a7823 (patch)
tree556259bfd41694eaff57c27e6778e4fc9837ab68
parentf852628638654f2dfa5eee3ec6a307a17b138ba7 (diff)
downloadu-boot-imx-be4424c73d3a0994c5fabc34900fb7101f6a7823.zip
u-boot-imx-be4424c73d3a0994c5fabc34900fb7101f6a7823.tar.gz
u-boot-imx-be4424c73d3a0994c5fabc34900fb7101f6a7823.tar.bz2
zlib: Add further watchdog reset calls
Patch 253cb831 [zlib: add watchdog reset call] added already a few watchdog reset calls to the new zlib U-Boot port. But on some boards this is not enough. Additional calls are needed on boards with short watchdog timeouts. This was detected and tested on the lwmon5 board with a very short watchdog timeout. Without this patch, the board resets during Linux kernel decompression. With it, the decompression succeeds. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Detlev Zundel <dzu@denx.de> Acked-by: Detlev Zundel <dzu@denx.de>
-rw-r--r--lib/zlib.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/zlib.c b/lib/zlib.c
index 2b31dba..e19484a 100644
--- a/lib/zlib.c
+++ b/lib/zlib.c
@@ -1599,6 +1599,7 @@ int flush;
strm->adler = state->check = adler32(0L, Z_NULL, 0);
state->mode = TYPE;
case TYPE:
+ WATCHDOG_RESET();
if (flush == Z_BLOCK) goto inf_leave;
case TYPEDO:
if (state->last) {