From: Stefan Roese <sr@denx.de>
Date: Wed, 8 Sep 2010 13:35:31 +0000 (+0200)
Subject: zlib: Add further watchdog reset calls
X-Git-Tag: v2010.12-rc1~128
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=be4424c73d3a0994c5fabc34900fb7101f6a7823;p=u-boot

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>
---

diff --git a/lib/zlib.c b/lib/zlib.c
index 2b31dbadb8..e19484aaa0 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) {