Merge branch 'master' of git://git.denx.de/u-boot

[oweals/u-boot.git] / common / splash.c

diff --git a/common/splash.c b/common/splash.c
index 89af437f2cafec3c648b13dc273e1fe4c1e4d287..e7d847726d0bb1d5df9470be3f48ba22c86ee6d4 100644 (file)
--- a/common/splash.c
+++ b/common/splash.c
@@ -21,6 +21,7 @@
  */
 
 #include <common.h>
+#include <env.h>
 #include <splash.h>
 #include <lcd.h>
 
@@ -51,16 +52,47 @@ static struct splash_location default_splash_locations[] = {
        },
 };
 
+#if defined(CONFIG_DM_VIDEO) && defined(CONFIG_VIDEO_LOGO)
+
+#include <bmp_logo_data.h>
+
+static int splash_video_logo_load(void)
+{
+       char *splashimage;
+       u32 bmp_load_addr;
+
+       splashimage = env_get("splashimage");
+       if (!splashimage)
+               return -ENOENT;
+
+       bmp_load_addr = simple_strtoul(splashimage, 0, 16);
+       if (!bmp_load_addr) {
+               printf("Error: bad 'splashimage' address\n");
+               return -EFAULT;
+       }
+
+       memcpy((void *)bmp_load_addr, bmp_logo_bitmap,
+              ARRAY_SIZE(bmp_logo_bitmap));
+
+       return 0;
+}
+#else
+static inline int splash_video_logo_load(void) { return -ENOSYS; }
+#endif
+
 __weak int splash_screen_prepare(void)
 {
-       return splash_source_load(default_splash_locations,
-                                 ARRAY_SIZE(default_splash_locations));
+       if (CONFIG_IS_ENABLED(SPLASH_SOURCE))
+               return splash_source_load(default_splash_locations,
+                                         ARRAY_SIZE(default_splash_locations));
+
+       return splash_video_logo_load();
 }
 
 #ifdef CONFIG_SPLASH_SCREEN_ALIGN
 void splash_get_pos(int *x, int *y)
 {
-       char *s = getenv("splashpos");
+       char *s = env_get("splashpos");
 
        if (!s)
                return;
@@ -80,17 +112,73 @@ void splash_get_pos(int *x, int *y)
 }
 #endif /* CONFIG_SPLASH_SCREEN_ALIGN */
 
-#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_LCD)
-int lcd_splash(ulong addr)
+#if defined(CONFIG_DM_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION)
+
+#ifdef CONFIG_VIDEO_LOGO
+#include <bmp_logo.h>
+#endif
+#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, row, ret;
+
+       ret = uclass_get_device(UCLASS_VIDEO_CONSOLE, 0, &dev);
+       if (ret)
+               return;
+
+#ifdef CONFIG_VIDEO_LOGO
+       col = BMP_LOGO_WIDTH / VIDEO_FONT_WIDTH + 1;
+       row = BMP_LOGO_HEIGHT / VIDEO_FONT_HEIGHT + 1;
+#else
+       col = 0;
+       row = 0;
+#endif
+
+       display_options_get_banner(false, buf, sizeof(buf));
+       vidconsole_position_cursor(dev, col, 1);
+       vidconsole_put_string(dev, buf);
+       vidconsole_position_cursor(dev, 0, row);
+}
+#endif /* CONFIG_DM_VIDEO && !CONFIG_HIDE_LOGO_VERSION */
+
+/*
+ * Common function to show a splash image if env("splashimage") is set.
+ * Is used for both dm_video and lcd video stacks. For additional
+ * details please refer to doc/README.splashprepare.
+ */
+#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_CMD_BMP)
+int splash_display(void)
+{
+       ulong addr;
+       char *s;
        int x = 0, y = 0, ret;
 
+       s = env_get("splashimage");
+       if (!s)
+               return -EINVAL;
+
+       addr = simple_strtoul(s, NULL, 16);
        ret = splash_screen_prepare();
        if (ret)
                return ret;
 
        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;
+
+#if defined(CONFIG_DM_VIDEO) && !defined(CONFIG_HIDE_LOGO_VERSION)
+       splash_display_banner();
+#endif
+end:
+       return ret;
 }
 #endif