summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwdenk <wdenk>2005-06-05 20:30:43 +0000
committerwdenk <wdenk>2005-06-05 20:30:43 +0000
commit51152c173d025551dce4e0097e14e147ad016d3b (patch)
treed478bf34f99a269aff610ab7577411514f9c6545
parentba91e26a1923dfc703d4b96ae9428067b7447ff2 (diff)
downloadu-boot-imx-51152c173d025551dce4e0097e14e147ad016d3b.zip
u-boot-imx-51152c173d025551dce4e0097e14e147ad016d3b.tar.gz
u-boot-imx-51152c173d025551dce4e0097e14e147ad016d3b.tar.bz2
Fix watchdog reset problems on LWMON board
-rw-r--r--CHANGELOG2
-rw-r--r--common/lcd.c1
-rw-r--r--post/cpu.c1
3 files changed, 4 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 717f4aa..aee8878 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 9713ea3..6650638 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 6d09a75..1f2ded2 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)