summaryrefslogtreecommitdiff
path: root/include/splash.h
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-02-10 10:41:54 -0500
committerTom Rini <trini@ti.com>2015-02-10 10:41:54 -0500
commit0dac731d1932027f4f813ec7aede35d5e30dec0e (patch)
tree522a20ea29730f0b5be03c8ced3b16a37fc165fe /include/splash.h
parent307367eaffc8638e10ba1784fc66bfe623ae79e2 (diff)
parent7bf71d1f55d31a81ade8dd0fc72f06e4672689d0 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-video
Conflicts: include/splash.h Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/splash.h')
-rw-r--r--include/splash.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/splash.h b/include/splash.h
index a60e8954234..7ae7a686888 100644
--- a/include/splash.h
+++ b/include/splash.h
@@ -22,6 +22,8 @@
#ifndef _SPLASH_H_
#define _SPLASH_H_
+#include <errno.h>
+
enum splash_storage {
SPLASH_STORAGE_NAND,
SPLASH_STORAGE_SF,
@@ -42,6 +44,15 @@ void splash_get_pos(int *x, int *y);
static inline void splash_get_pos(int *x, int *y) { }
#endif
+#if defined(CONFIG_SPLASH_SCREEN) && defined(CONFIG_LCD)
+int lcd_splash(ulong addr);
+#else
+static inline int lcd_splash(ulong addr)
+{
+ return -ENOSYS;
+}
+#endif
+
#define BMP_ALIGN_CENTER 0x7FFF
#endif