summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-11-14 15:05:53 -0500
committerTom Rini <trini@ti.com>2014-11-14 15:05:53 -0500
commit6393c43c18a1aadcdcdd8551826eef15f50353d5 (patch)
treeb405088f82d68817e8d6fe5deebce654bebfc901
parent45043cf804763d4cf93fec93d8294e385f87622a (diff)
parentd37e96ecb9886714e0b5e167a91404cde8351b19 (diff)
downloadblackbird-obmc-uboot-6393c43c18a1aadcdcdd8551826eef15f50353d5.tar.gz
blackbird-obmc-uboot-6393c43c18a1aadcdcdd8551826eef15f50353d5.zip
Merge branch 'master' of git://git.denx.de/u-boot-video
-rw-r--r--drivers/video/cfb_console.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 6aa50cb4f9..a347e13d7d 100644
--- 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);
+ }
}
/*
OpenPOWER on IntegriCloud