Merge remote-tracking branch 'u-boot/master' into 'u-boot-arm/master'

[u-boot] / arch / sandbox / include / asm / u-boot-sandbox.h

diff --git a/arch/sandbox/include/asm/u-boot-sandbox.h b/arch/sandbox/include/asm/u-boot-sandbox.h
index 5707c2710d9fc1707ae25df940c82fe81260950f..770ab5c9cc07ec6fa497bd3d7b631072b8e10f5d 100644 (file)
--- a/arch/sandbox/include/asm/u-boot-sandbox.h
+++ b/arch/sandbox/include/asm/u-boot-sandbox.h
@@ -17,7 +17,6 @@
 
 /* board/.../... */
 int board_init(void);
-int dram_init(void);
 
 /* start.c */
 int sandbox_early_getopt_check(void);
@@ -25,4 +24,7 @@ int sandbox_main_loop_init(void);
 
 int cleanup_before_linux(void);
 
+/* drivers/video/sandbox_sdl.c */
+int sandbox_lcd_sdl_early_init(void);
+
 #endif /* _U_BOOT_SANDBOX_H_ */