Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-video

Browse Source 
Conflicts:
	include/splash.h

Signed-off-by: Tom Rini <trini@ti.com>
This commit is contained in:
Tom Rini
2015-02-10 10:41:54 -05:00
parent 307367eaff 7bf71d1f55
commit 0dac731d19
17 changed files with 575 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/splash.h
View File

@@ -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