diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-27 19:22:21 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-27 19:22:21 (GMT) |
| commit | c6f086ddcbfb47918b82f6a135c61f432540da42 (patch) | |
| tree | 0482b02162e5dbc71e5c43ebda54ff3c4adec7ca /include | |
| parent | 0b6699ad8ea95803d7ce40d1dc1caea902a6d22c (diff) | |
| parent | b6de2cd7ee5af536ae67ab5522b69e5c4925f5f2 (diff) | |
| download | u-boot-c6f086ddcbfb47918b82f6a135c61f432540da42.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'include')
| -rw-r--r-- | include/splash.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/splash.h b/include/splash.h index 25df1cf..136eac7 100644 --- a/include/splash.h +++ b/include/splash.h @@ -47,7 +47,16 @@ struct splash_location { char *ubivol; /* UBI volume-name for ubifsmount */ }; +#ifdef CONFIG_SPLASH_SOURCE int splash_source_load(struct splash_location *locations, uint size); +#else +static inline int splash_source_load(struct splash_location *locations, + uint size) +{ + return 0; +} +#endif + int splash_screen_prepare(void); #ifdef CONFIG_SPLASH_SCREEN_ALIGN |