summaryrefslogtreecommitdiff
path: root/cpu/mpc8xx
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-05-03 15:50:43 +0000
committerwdenk <wdenk>2003-05-03 15:50:43 +0000
commit7aa78614716b7bd7bdf68553f261ad0d5a12826a (patch)
tree756a98d1deac76f1cfba3d8da18c19e7183618c8 /cpu/mpc8xx
parent4532cb696eb717419022dbaa8d408e7df7df7b68 (diff)
downloadu-boot-imx-7aa78614716b7bd7bdf68553f261ad0d5a12826a.zip
u-boot-imx-7aa78614716b7bd7bdf68553f261ad0d5a12826a.tar.gz
u-boot-imx-7aa78614716b7bd7bdf68553f261ad0d5a12826a.tar.bz2
* Add support for Promess ATC board
* Patch by Keith Outwater, 28 Apr 2003: - Miscellaneous corrections and additions to GEN860T board specific code. - Added GEN860_SC variant to GEN860T. - Miscellaneous corrections to GEN860T documentation. - Correct duplicate entry in U-Boot CREDITS file. - Add GEN860T_SC entry in MAINTAINERS file. - Update CREDITS file with GEN860T_SC info. * Update Smiths Aerospace addresses in MAINTAINERS file * Fix error handling in hush's version of "run" command
Diffstat (limited to 'cpu/mpc8xx')
-rw-r--r--cpu/mpc8xx/lcd.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/cpu/mpc8xx/lcd.c b/cpu/mpc8xx/lcd.c
index 3d3b039..0db5348 100644
--- a/cpu/mpc8xx/lcd.c
+++ b/cpu/mpc8xx/lcd.c
@@ -27,6 +27,7 @@
#include <config.h>
#include <common.h>
+#include <watchdog.h>
#include <version.h>
#include <stdarg.h>
#include <lcdvideo.h>
@@ -1059,6 +1060,8 @@ static void bitmap_plot (int x, int y)
/* Leave room for default color map */
cmap = (ushort *)&(cp->lcd_cmap[BMP_LOGO_OFFSET*sizeof(ushort)]);
+ WATCHDOG_RESET();
+
/* Set color map */
for (i=0; i<(sizeof(bmp_logo_palette)/(sizeof(ushort))); ++i) {
ushort colreg = bmp_logo_palette[i];
@@ -1071,11 +1074,15 @@ static void bitmap_plot (int x, int y)
bmap = &bmp_logo_bitmap[0];
fb = (char *)(lcd_base + y * lcd_line_length + x);
+ WATCHDOG_RESET();
+
for (i=0; i<BMP_LOGO_HEIGHT; ++i) {
memcpy (fb, bmap, BMP_LOGO_WIDTH);
bmap += BMP_LOGO_WIDTH;
fb += panel_info.vl_col;
}
+
+ WATCHDOG_RESET();
}
#endif /* CONFIG_LCD_LOGO */
@@ -1098,6 +1105,8 @@ int lcd_display_bitmap(ulong bmp_image)
unsigned colors,bpix;
unsigned long compression;
+ WATCHDOG_RESET();
+
if (!((bmp->header.signature[0]=='B') &&
(bmp->header.signature[1]=='M'))) {
printf ("Error: no valid bmp image at %lx\n", bmp_image);
@@ -1149,6 +1158,8 @@ int lcd_display_bitmap(ulong bmp_image)
#endif
*cmap-- = colreg;
}
+
+ WATCHDOG_RESET();
}
padded_line = (width&0x3) ? ((width&~0x3)+4) : (width);
@@ -1163,6 +1174,7 @@ int lcd_display_bitmap(ulong bmp_image)
(((height>=panel_info.vl_row) ? panel_info.vl_row : height)-1)
* lcd_line_length);
for (i = 0; i < height; ++i) {
+ WATCHDOG_RESET();
for (j = 0; j < width ; j++)
*(fb++)=255-*(bmap++);
bmap += (width - padded_line);