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

[u-boot] / arch / blackfin / lib / boot.c

diff --git a/arch/blackfin/lib/boot.c b/arch/blackfin/lib/boot.c
index 37aa82a055b0b6af40872134077398fbcadab6f1..768a8826b55c1ac94814f9a56b7033efddf9bd9d 100644 (file)
--- a/arch/blackfin/lib/boot.c
+++ b/arch/blackfin/lib/boot.c
@@ -18,6 +18,10 @@
 extern void swap_to(int device_id);
 #endif
 
+#ifdef CONFIG_VIDEO
+extern void video_stop(void);
+#endif
+
 static char *make_command_line(void)
 {
        char *dest = (char *)CONFIG_LINUX_CMDLINE_ADDR;
@@ -45,6 +49,11 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima
        swap_to(FLASH);
 #endif
 
+#ifdef CONFIG_VIDEO
+       /* maybe this should be standardized and moved to bootm ... */
+       video_stop();
+#endif
+
        appl = (int (*)(char *))images->ep;
 
        printf("Starting Kernel at = %p\n", appl);