diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-27 15:22:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-27 15:22:21 -0400 |
| commit | c6f086ddcbfb47918b82f6a135c61f432540da42 (patch) | |
| tree | 0482b02162e5dbc71e5c43ebda54ff3c4adec7ca /drivers/video | |
| parent | 0b6699ad8ea95803d7ce40d1dc1caea902a6d22c (diff) | |
| parent | b6de2cd7ee5af536ae67ab5522b69e5c4925f5f2 (diff) | |
| download | u-boot-imx-c6f086ddcbfb47918b82f6a135c61f432540da42.zip u-boot-imx-c6f086ddcbfb47918b82f6a135c61f432540da42.tar.gz u-boot-imx-c6f086ddcbfb47918b82f6a135c61f432540da42.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/cfb_console.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index ef4984b..30b53db 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -1929,10 +1929,10 @@ static void plot_logo_or_black(void *screen, int x, int y, int black) static void *video_logo(void) { char info[128]; - int space, len; __maybe_unused int y_off = 0; __maybe_unused ulong addr; __maybe_unused char *s; + __maybe_unused int len, space; splash_get_pos(&video_logo_xpos, &video_logo_ypos); @@ -1978,6 +1978,7 @@ static void *video_logo(void) sprintf(info, " %s", version_string); +#ifndef CONFIG_HIDE_LOGO_VERSION space = (VIDEO_LINE_LEN / 2 - VIDEO_INFO_X) / VIDEO_FONT_WIDTH; len = strlen(info); @@ -2027,6 +2028,7 @@ static void *video_logo(void) } } #endif +#endif return (video_fb_address + video_logo_height * VIDEO_LINE_LEN); } |