diff options
| author | Ye.Li <B37916@freescale.com> | 2015-04-14 17:27:14 +0800 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-04-05 14:04:31 +0800 |
| commit | d5113c13b372be3176c97bfed804f02ea6f49d10 (patch) | |
| tree | 937e2d6c1600855a942f9911e730dfa679a5a23d /drivers/video | |
| parent | 9ae77e208d66e15eafd221e7b09bf2c41aac6bdb (diff) | |
| download | u-boot-imx-d5113c13b372be3176c97bfed804f02ea6f49d10.zip u-boot-imx-d5113c13b372be3176c97bfed804f02ea6f49d10.tar.gz u-boot-imx-d5113c13b372be3176c97bfed804f02ea6f49d10.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)
(cherry picked from commit bd265a064c8f797e542955352d170e7f20f7b0d1)
(cherry picked from commit aaa55881de3e9aa8232c819a2c8a3abb285b682f)
Diffstat (limited to 'drivers/video')
| -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 df5d91f..9ac63d0 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -1917,12 +1917,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--; @@ -1931,8 +1933,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; } } |