From: Tom Rini <trini@ti.com>
Date: Tue, 10 Feb 2015 15:41:54 +0000 (-0500)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-video
X-Git-Tag: v2015.04-rc2~34
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0dac731d1932027f4f813ec7aede35d5e30dec0e;p=u-boot

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

Conflicts:
	include/splash.h

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

0dac731d1932027f4f813ec7aede35d5e30dec0e
diff --cc common/Makefile
index b97bb95e6d,71f16dc5a0..7216a13922
--- a/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 a60e895423,4dbf754ace..7ae7a68688
--- a/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