X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fsplash.c;h=561d35b4e41f9072d84e430d028e92ec8aecd8c3;hb=e32d0db7985eece55ad099c6c86d00d441fdf48c;hp=18885f1bfe6e6878633cbe80affaef89c2b93f20;hpb=2f4998ab4429af4b805f8566268c3b761aa4babd;p=u-boot

diff --git a/common/splash.c b/common/splash.c
index 18885f1bfe..561d35b4e4 100644
--- a/common/splash.c
+++ b/common/splash.c
@@ -22,16 +22,13 @@
 
 #include <common.h>
 #include <splash.h>
+#include <lcd.h>
 
-int __splash_screen_prepare(void)
+__weak int splash_screen_prepare(void)
 {
 	return 0;
 }
 
-int splash_screen_prepare(void)
-	__attribute__ ((weak, alias("__splash_screen_prepare")));
-
-
 #ifdef CONFIG_SPLASH_SCREEN_ALIGN
 void splash_get_pos(int *x, int *y)
 {
@@ -54,3 +51,18 @@ 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)
+{
+	int x = 0, y = 0, ret;
+
+	ret = splash_screen_prepare();
+	if (ret)
+		return ret;
+
+	splash_get_pos(&x, &y);
+
+	return bmp_display(addr, x, y);
+}
+#endif