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

Conflicts:
	include/splash.h

Signed-off-by: Tom Rini <trini@ti.com>

diff --cc common/Makefile
index b97bb95e6dec710dfc659cab5c5d44baaacbca98,71f16dc5a050cd029ccbd10d7e3a5c2fe01b20d4..7216a1392230e32e8e980d36e26391d3b512eac3
--- 1/common/Makefile
--- 2/common/Makefile
+++ b/common/Makefile
@@@ -198,8 -198,8 +198,9 @@@ obj-$(CONFIG_CMD_KGDB) += kgdb.o kgdb_s
  obj-$(CONFIG_I2C_EDID) += edid.o
  obj-$(CONFIG_KALLSYMS) += kallsyms.o
  obj-y += splash.o
 +obj-$(CONFIG_SPLASH_SOURCE) += splash_source.o
  obj-$(CONFIG_LCD) += lcd.o lcd_console.o
+ obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o
  obj-$(CONFIG_LYNXKDI) += lynxkdi.o
  obj-$(CONFIG_MENU) += menu.o
  obj-$(CONFIG_MODEM_SUPPORT) += modem.o

diff --cc include/splash.h
index a60e89542343532b2356d86f0215f30d53e228c6,4dbf754ace94052e4540692e78ee676d95c77531..7ae7a686888c8e94b4051e38789ee3b48adce098
--- 1/include/splash.h
--- 2/include/splash.h
+++ b/include/splash.h
@@@ -21,19 -21,8 +21,21 @@@
  
  #ifndef _SPLASH_H_
  #define _SPLASH_H_
 +
+ #include <errno.h>
+ 
 +enum splash_storage {
 +      SPLASH_STORAGE_NAND,
 +      SPLASH_STORAGE_SF,
 +};
 +
 +struct splash_location {
 +      char *name;
 +      enum splash_storage storage;
 +      u32 offset;     /* offset from start of storage */
 +};
 +
 +int splash_source_load(struct splash_location *locations, uint size);
  int splash_screen_prepare(void);
  
  #ifdef CONFIG_SPLASH_SCREEN_ALIGN