Fix watchdog reset problems on LWMON board

diff --git a/CHANGELOG b/CHANGELOG
index 717f4aa291a0997a3825742a25d01779b32279f5..aee8878ff666d8ce73c23c1e5156e02a5b997ca1 100644 (file)
--- 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 9713ea30819fcc21162790266c7d847f43611392..66506381a5d6e774454bc618366ac9efcad0c637 100644 (file)
--- 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 6d09a75ebc535e49e07d52ecc202dc85918f5512..1f2ded2bf2642db034b0c3bc5b7057588eb80203 100644 (file)
--- 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)