diff mbox series

[U-Boot] splash: fix splash banner output

Message ID 20190920154355.26215-1-agust@denx.de
State Superseded
Delegated to: Anatolij Gustschin
Headers show
Series [U-Boot] splash: fix splash banner output | expand

Commit Message

Anatolij Gustschin Sept. 20, 2019, 3:43 p.m. UTC 
Old splash code in cfb_console driver displayed U-Boot version
string by default. Restore this behaviour for DM_VIDEO enabled
configurations.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
 common/splash.c | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

Comments

Anatolij Gustschin Sept. 20, 2019, 4:18 p.m. UTC | #1 
On Fri, 20 Sep 2019 17:43:55 +0200
Anatolij Gustschin agust@denx.de wrote:
...
> ---
>  common/splash.c | 39 ++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 38 insertions(+), 1 deletion(-)

This has some build issues with sandbox and arc arch, I'll prepare
v2 patch.

--
Anatolij
diff mbox series

Patch

diff --git a/common/splash.c b/common/splash.c
index 1a5db69a7e..10089fe33a 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -112,6 +112,35 @@  void splash_get_pos(int *x, int *y)
 }
 #endif /* CONFIG_SPLASH_SCREEN_ALIGN */
 
+#ifndef CONFIG_HIDE_LOGO_VERSION
+
+#include <bmp_logo.h>
+#include <dm.h>
+#include <video_console.h>
+#include <video_font.h>
+
+void splash_display_banner(void)
+{
+	struct udevice *dev;
+	char buf[DISPLAY_OPTIONS_BANNER_LENGTH];
+	int col, raw, ret;
+
+	ret = uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &dev);
+	if (ret)
+		return;
+
+	col = BMP_LOGO_WIDTH / VIDEO_FONT_WIDTH + 1;
+	raw = BMP_LOGO_HEIGHT / VIDEO_FONT_HEIGHT + 1;
+
+	display_options_get_banner(false, buf, sizeof(buf));
+	vidconsole_position_cursor(dev, col, 1);
+	vidconsole_put_string(dev, buf);
+	vidconsole_position_cursor(dev, 0, raw);
+}
+#else
+static inline void splash_display_banner(void) { }
+#endif
+
 /*
  * Common function to show a splash image if env("splashimage") is set.
  * Is used for both dm_video and lcd video stacks. For additional
@@ -135,6 +164,14 @@  int splash_display(void)
 
 	splash_get_pos(&x, &y);
 
-	return bmp_display(addr, x, y);
+	ret = bmp_display(addr, x, y);
+
+	/* Skip banner output on video console if the logo is not at 0,0 */
+	if (x || y)
+		goto end;
+
+	splash_display_banner();
+end:
+	return ret;
 }
 #endif