leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video: allow version string to be optional when using LOGO

Browse Source 
The CONFIG_HIDE_LOGO_VERSION config can be used to disable putting the
U-Boot version string on top of the logo.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
This commit is contained in:
Tim Harvey 2016-05-24 14:59:59 -07:00 committed by Anatolij Gustschin
parent 19ce924ff9
commit adde435fa7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README
View File

@ -840,6 +840,9 @@ The following options need to be configured:
CONFIG_CONSOLE_EXTRA_INFO CONFIG_CONSOLE_EXTRA_INFO
additional board info beside additional board info beside
the logo the logo
CONFIG_HIDE_LOGO_VERSION
do not display bootloader
version string
When CONFIG_CFB_CONSOLE_ANSI is defined, console will support When CONFIG_CFB_CONSOLE_ANSI is defined, console will support
a limited number of ANSI escape sequences (cursor control, a limited number of ANSI escape sequences (cursor control,

4
drivers/video/cfb_console.c
View File

@ -1929,10 +1929,10 @@ static void plot_logo_or_black(void *screen, int x, int y, int black)
static void *video_logo(void) static void *video_logo(void)
{ {
char info[128]; char info[128];
int space, len;
__maybe_unused int y_off = 0; __maybe_unused int y_off = 0;
__maybe_unused ulong addr; __maybe_unused ulong addr;
__maybe_unused char *s; __maybe_unused char *s;
__maybe_unused int len, space;
splash_get_pos(&video_logo_xpos, &video_logo_ypos); splash_get_pos(&video_logo_xpos, &video_logo_ypos);
@ -1978,6 +1978,7 @@ static void *video_logo(void)
sprintf(info, " %s", version_string); sprintf(info, " %s", version_string);
#ifndef CONFIG_HIDE_LOGO_VERSION
space = (VIDEO_LINE_LEN / 2 - VIDEO_INFO_X) / VIDEO_FONT_WIDTH; space = (VIDEO_LINE_LEN / 2 - VIDEO_INFO_X) / VIDEO_FONT_WIDTH;
len = strlen(info); len = strlen(info);
@ -2026,6 +2027,7 @@ static void *video_logo(void)
} }
} }
} }
#endif
#endif #endif
return (video_fb_address + video_logo_height * VIDEO_LINE_LEN); return (video_fb_address + video_logo_height * VIDEO_LINE_LEN);