diff options
| author | Tim Harvey <tharvey@gateworks.com> | 2016-05-24 14:59:59 -0700 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2016-07-11 22:26:40 +0200 |
| commit | adde435fa7c03c17c40e9f771eceed127fbbc251 (patch) | |
| tree | 839ecc5627a54f0c829298ffc22ad74c92e30aaf | |
| parent | 19ce924ff914f315dc2fdf79f357825c513aed6e (diff) | |
| download | u-boot-adde435fa7c03c17c40e9f771eceed127fbbc251.tar.gz u-boot-adde435fa7c03c17c40e9f771eceed127fbbc251.tar.bz2 u-boot-adde435fa7c03c17c40e9f771eceed127fbbc251.zip | |
video: allow version string to be optional when using LOGO
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>
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | drivers/video/cfb_console.c | 4 |
2 files changed, 6 insertions, 1 deletions
@@ -840,6 +840,9 @@ The following options need to be configured: CONFIG_CONSOLE_EXTRA_INFO additional board info beside the logo + CONFIG_HIDE_LOGO_VERSION + do not display bootloader + version string When CONFIG_CFB_CONSOLE_ANSI is defined, console will support a limited number of ANSI escape sequences (cursor control, diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index ef4984becb..30b53dbb80 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); } |