diff options
| author | Ye.Li <B37916@freescale.com> | 2015-04-14 17:27:14 +0800 |
|---|---|---|
| committer | Peng Fan <Peng.Fan@freescale.com> | 2015-04-29 15:08:08 +0800 |
| commit | bd265a064c8f797e542955352d170e7f20f7b0d1 (patch) | |
| tree | 5d732d251a8e7462c5e259fa4c986b614c9e6d57 | |
| parent | d85cd484e6825631aa1ab572e5e0539f2191d795 (diff) | |
| download | u-boot-imx-bd265a064c8f797e542955352d170e7f20f7b0d1.zip u-boot-imx-bd265a064c8f797e542955352d170e7f20f7b0d1.tar.gz u-boot-imx-bd265a064c8f797e542955352d170e7f20f7b0d1.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)
(cherry picked from commit ff62c5b275a9b5e47d570d3eb10622799bf12070)
| -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 9079ac4..6a6f650 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -2043,12 +2043,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--; @@ -2057,8 +2059,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; } } |