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

Conflicts: include/splash.h Signed-off-by: Tom Rini <trini@ti.com>
2015-02-10 10:41:54 -05:00
parent 307367eaff 7bf71d1f55
commit 0dac731d19
17 changed files with 575 additions and 546 deletions
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -18,6 +18,7 @@
 #include <config.h>
 #include <dm.h>
 #include <fdt_support.h>
+#include <fdt_simplefb.h>
 #include <lcd.h>
 #include <mmc.h>
 #include <asm/gpio.h>