apalis-tk1: switch to zImage

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

diff --git a/common/splash.c b/common/splash.c
index d251b3b6547018f75faca2da742e89edd53af319..79d50577ee16c5d9e37cfd637923d43aa685053c 100644 (file)
--- a/common/splash.c
+++ b/common/splash.c
@@ -80,11 +80,23 @@ 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)
+/*
+ * 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;