From b96f9ffbc0eaaccd6955e3a60213ab1284334381 Mon Sep 17 00:00:00 2001
From: Gary Bisson <gary.bisson@boundarydevices.com>
Date: Wed, 4 May 2016 19:20:27 +0200
Subject: [PATCH] cfb_console: display version before drawing the logo
So the version never overwrites the logo in case it starts at
the top of the display.
Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>
---
drivers/video/cfb_console.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 95e9dcfc651..68d8c7dc193 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -2108,17 +2108,17 @@ static int cfg_video_init(void)
if (!CONFIG_IS_ENABLED(NO_FB_CLEAR))
video_clear();
-#if defined(CONFIG_VIDEO_LOGO) || defined(CONFIG_SPLASH_SCREEN)
- /* Plot the logo and get start point of console */
- debug("Video: Drawing the logo ...\n");
- video_console_address = video_logo();
-#endif
#ifndef CONFIG_VIDEO_LOGO
if (!board_cfb_skip()){
video_console_address = video_fb_address;
video_drawstring(VIDEO_FONT_WIDTH, 0, (uchar *)version_string);
}
#endif
+#if defined(CONFIG_VIDEO_LOGO) || defined(CONFIG_SPLASH_SCREEN)
+ /* Plot the logo and get start point of console */
+ debug("Video: Drawing the logo ...\n");
+ video_console_address = video_logo();
+#endif
/* Initialize the console */
console_col = 0;
--
GitLab