summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYe.Li <B37916@freescale.com>2015-04-14 17:27:14 +0800
committerYe.Li <B37916@freescale.com>2015-04-14 17:55:23 +0800
commitac430cee8c42f0acad9e126631d772b99f1166ea (patch)
tree709a170e1c6e238b3a9b7ffef5d30bed51d1d32d
parentf5d5f07fba936c4bb05c887de9d72fb75b3dc0f2 (diff)
downloadu-boot-imx-ac430cee8c42f0acad9e126631d772b99f1166ea.zip
u-boot-imx-ac430cee8c42f0acad9e126631d772b99f1166ea.tar.gz
u-boot-imx-ac430cee8c42f0acad9e126631d772b99f1166ea.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>
-rw-r--r--drivers/video/cfb_console.c9
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;
}
}