summaryrefslogtreecommitdiff
path: root/lib_generic/bzlib.c
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-10-11 22:43:02 +0000
committerwdenk <wdenk>2004-10-11 22:43:02 +0000
commit2ee665339b06285a5fd9e36410d1167efc9b0606 (patch)
treed6de628020ca2600a1ecb20027ce06d1b7986d1d /lib_generic/bzlib.c
parent9455b7f39cecbcd869b1ba49a1307cb97e67360f (diff)
downloadu-boot-imx-2ee665339b06285a5fd9e36410d1167efc9b0606.zip
u-boot-imx-2ee665339b06285a5fd9e36410d1167efc9b0606.tar.gz
u-boot-imx-2ee665339b06285a5fd9e36410d1167efc9b0606.tar.bz2
* Patch by Pantelis Antoniou, 14 Sep 2004:
Fix early serial hang when CONFIG_SERIAL_MULTI is defined. * Patch by Pantelis Antoniou, 14 Sep 2004: Kick watchdog when bz-decompressing
Diffstat (limited to 'lib_generic/bzlib.c')
-rw-r--r--lib_generic/bzlib.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib_generic/bzlib.c b/lib_generic/bzlib.c
index 8a64b79..87e6a6e 100644
--- a/lib_generic/bzlib.c
+++ b/lib_generic/bzlib.c
@@ -1,4 +1,6 @@
#include <config.h>
+#include <common.h>
+#include <watchdog.h>
#ifdef CONFIG_BZIP2
/*
@@ -841,6 +843,9 @@ int BZ_API(BZ2_bzDecompress) ( bz_stream *strm )
if (s->strm != strm) return BZ_PARAM_ERROR;
while (True) {
+#if defined(CONFIG_HW_WATCHDOG) || defined(CONFIG_WATCHDOG)
+ WATCHDOG_RESET();
+#endif
if (s->state == BZ_X_IDLE) return BZ_SEQUENCE_ERROR;
if (s->state == BZ_X_OUTPUT) {
if (s->smallDecompress)