diff options
| author | Stefano Babic <sbabic@denx.de> | 2015-02-13 11:17:01 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-02-13 11:17:01 +0100 |
| commit | e72d344386bf80738fab7a6bd37cb321f443093a (patch) | |
| tree | d3e02055e6aa903ab80ef87c78d2f38e93981dcf /common/splash.c | |
| parent | 258c98f8d36ef35d7cb7604847ba73e64d702c2a (diff) | |
| parent | bd2a4888b123713adec271d6c8040ca9f609aa2f (diff) | |
| download | u-boot-imx-e72d344386bf80738fab7a6bd37cb321f443093a.zip u-boot-imx-e72d344386bf80738fab7a6bd37cb321f443093a.tar.gz u-boot-imx-e72d344386bf80738fab7a6bd37cb321f443093a.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot
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 |