summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-10-30 08:36:48 -0400
committerTom Rini <trini@ti.com>2013-10-30 08:36:48 -0400
commit509dca7a11aad394d781a9d31a7bfa6692562741 (patch)
treec27d8d344c98504ebc8b8b44565813099f18fc04 /include
parent877bfe37dc00b0ae59f37742954a62bce3fdf3a0 (diff)
parent1c6e9de53ba47afacd26fb784818aeb63a01baad (diff)
downloadu-boot-imx-509dca7a11aad394d781a9d31a7bfa6692562741.zip
u-boot-imx-509dca7a11aad394d781a9d31a7bfa6692562741.tar.gz
u-boot-imx-509dca7a11aad394d781a9d31a7bfa6692562741.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'include')
-rw-r--r--include/video_fb.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/video_fb.h b/include/video_fb.h
index 028e2a6..6cd4e37 100644
--- a/include/video_fb.h
+++ b/include/video_fb.h
@@ -18,8 +18,13 @@
#ifndef _VIDEO_FB_H_
#define _VIDEO_FB_H_
+#if defined(CONFIG_SYS_CONSOLE_FG_COL) && defined(CONFIG_SYS_CONSOLE_BG_COL)
+#define CONSOLE_BG_COL CONFIG_SYS_CONSOLE_BG_COL
+#define CONSOLE_FG_COL CONFIG_SYS_CONSOLE_FG_COL
+#else
#define CONSOLE_BG_COL 0x00
#define CONSOLE_FG_COL 0xa0
+#endif
/*
* Graphic Data Format (GDF) bits for VIDEO_DATA_FORMAT