From: wdenk <wdenk>
Date: Sun, 5 Jun 2005 20:30:43 +0000 (+0000)
Subject: Fix watchdog reset problems on LWMON board
X-Git-Tag: LABEL_2006_03_12_0025~278
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=51152c173d025551dce4e0097e14e147ad016d3b;p=u-boot

Fix watchdog reset problems on LWMON board
---

diff --git a/CHANGELOG b/CHANGELOG
index 717f4aa291..aee8878ff6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes for U-Boot 1.1.3:
 ======================================================================
 
+* Fix watchdog reset problems on LWMON board
+
 * Patch by Juergen Selent, 17 May 2005:
   Add support for Funkwerk VoVPN gateway module.
 
diff --git a/common/lcd.c b/common/lcd.c
index 9713ea3081..66506381a5 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -655,6 +655,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y)
 	fb   = (uchar *) (lcd_base +
 		(y + height - 1) * lcd_line_length + x);
 	for (i = 0; i < height; ++i) {
+		WATCHDOG_RESET();
 		for (j = 0; j < width ; j++)
 #if defined(CONFIG_PXA250)
 			*(fb++)=*(bmap++);
diff --git a/post/cpu.c b/post/cpu.c
index 6d09a75ebc..1f2ded2bf2 100644
--- a/post/cpu.c
+++ b/post/cpu.c
@@ -120,6 +120,7 @@ int cpu_post_test (int flags)
 	WATCHDOG_RESET();
 	if (ret == 0)
 		ret = cpu_post_test_multi ();
+	WATCHDOG_RESET();
 	if (ret == 0)
 		ret = cpu_post_test_string ();
 	if (ret == 0)