diff options
author | Tom Rini <trini@ti.com> | 2015-02-10 10:41:54 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2015-02-10 10:41:54 -0500 |
commit | 0dac731d1932027f4f813ec7aede35d5e30dec0e (patch) | |
tree | 522a20ea29730f0b5be03c8ced3b16a37fc165fe /common/splash.c | |
parent | 307367eaffc8638e10ba1784fc66bfe623ae79e2 (diff) | |
parent | 7bf71d1f55d31a81ade8dd0fc72f06e4672689d0 (diff) | |
download | u-boot-imx-0dac731d1932027f4f813ec7aede35d5e30dec0e.zip u-boot-imx-0dac731d1932027f4f813ec7aede35d5e30dec0e.tar.gz u-boot-imx-0dac731d1932027f4f813ec7aede35d5e30dec0e.tar.bz2 |
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 'common/splash.c')
-rw-r--r-- | common/splash.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/common/splash.c b/common/splash.c index 144fb10..561d35b 100644 --- a/common/splash.c +++ b/common/splash.c @@ -22,6 +22,7 @@ #include <common.h> #include <splash.h> +#include <lcd.h> __weak int splash_screen_prepare(void) { @@ -50,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 |