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

diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 6aa50cb4f966c70d3495ea5588db8b42bb40bcd7..a347e13d7de8fa5fc360524a76afdd85c70cb26e 100644 (file)
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -1160,10 +1160,19 @@ static void video_putc(struct stdio_dev *dev, const char c)
 
 static void video_puts(struct stdio_dev *dev, const char *s)
 {
+       int flush = cfb_do_flush_cache;
        int count = strlen(s);
 
+       /* temporarily disable cache flush */
+       cfb_do_flush_cache = 0;
+
        while (count--)
                video_putc(dev, *s++);
+
+       if (flush) {
+               cfb_do_flush_cache = flush;
+               flush_cache(VIDEO_FB_ADRS, VIDEO_SIZE);
+       }
 }
 
 /*