diff options
| author | Ye.Li <B37916@freescale.com> | 2015-04-14 17:27:14 +0800 |
|---|---|---|
| committer | Ye.Li <B37916@freescale.com> | 2015-04-14 17:56:37 +0800 |
| commit | ff62c5b275a9b5e47d570d3eb10622799bf12070 (patch) | |
| tree | 07f29af628ba39ea49003e4d173f8e4fe46dfa09 | |
| parent | 86c784cf4c4b633d37a76de7d47155c08f75dc82 (diff) | |
| download | u-boot-imx-ff62c5b275a9b5e47d570d3eb10622799bf12070.zip u-boot-imx-ff62c5b275a9b5e47d570d3eb10622799bf12070.tar.gz u-boot-imx-ff62c5b275a9b5e47d570d3eb10622799bf12070.tar.bz2 | |
MLK-10655 Video: Fix second line string display issue
The string display on second line repeats the last word of
first line and does not show full.
This is the bug introduced by the fixing to MLK-10542.
Signed-off-by: Ye.Li <B37916@freescale.com>
(cherry picked from commit ac430cee8c42f0acad9e126631d772b99f1166ea)
| -rw-r--r-- | drivers/video/cfb_console.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index d9b8f5a..f37d97b 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -2042,12 +2042,14 @@ static void *video_logo(void) if (len > space) { int xx = VIDEO_INFO_X, yy = VIDEO_INFO_Y; + uchar *p = (uchar *) info; while (len) { if (len > space) { - video_drawchars(xx, yy, - (uchar *) info + (y_off * space), space); + video_drawchars(xx, yy, p, space); len -= space; + p = (uchar *) p + space; + if (!y_off) { xx += VIDEO_FONT_WIDTH; space--; @@ -2056,8 +2058,7 @@ static void *video_logo(void) y_off++; } else { - video_drawchars(xx, yy, - (uchar *) info + (y_off * space), len); + video_drawchars(xx, yy, p, len); len = 0; } } |