diff options
| author | Minkyu Kang <mk7.kang@samsung.com> | 2009-11-10 08:44:30 +0900 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2009-11-10 08:44:30 +0900 |
| commit | b6d8992cbbe5f04c11f7e6e09c09ae1a031d8720 (patch) | |
| tree | 38d607f78f33bcd41d8da448f4da7d5c220b4f93 /common/lcd.c | |
| parent | f9000d975b5f2550defd5fe5b57392a72fc77201 (diff) | |
| parent | b91b8f74fe9ded18344c3d03080a4abc07254502 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'common/lcd.c')
| -rw-r--r-- | common/lcd.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/common/lcd.c b/common/lcd.c index dc8fea66946..4e316183dbc 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -99,32 +99,11 @@ static int lcd_getfgcolor (void); static void console_scrollup (void) { -#if 1 /* Copy up rows ignoring the first one */ memcpy (CONSOLE_ROW_FIRST, CONSOLE_ROW_SECOND, CONSOLE_SCROLL_SIZE); /* Clear the last one */ memset (CONSOLE_ROW_LAST, COLOR_MASK(lcd_color_bg), CONSOLE_ROW_SIZE); -#else - /* - * Poor attempt to optimize speed by moving "long"s. - * But the code is ugly, and not a bit faster :-( - */ - ulong *t = (ulong *)CONSOLE_ROW_FIRST; - ulong *s = (ulong *)CONSOLE_ROW_SECOND; - ulong l = CONSOLE_SCROLL_SIZE / sizeof(ulong); - uchar c = lcd_color_bg & 0xFF; - ulong val= (c<<24) | (c<<16) | (c<<8) | c; - - while (l--) - *t++ = *s++; - - t = (ulong *)CONSOLE_ROW_LAST; - l = CONSOLE_ROW_SIZE / sizeof(ulong); - - while (l-- > 0) - *t++ = val; -#endif } /*----------------------------------------------------------------------*/ |