summaryrefslogtreecommitdiff
path: root/include/video_font.h
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2013-07-30 23:37:58 +0200
committerAnatolij Gustschin <agust@denx.de>2013-08-12 22:34:09 +0200
commit785566312551ee0c3c7e352cb93f30998ebcdd16 (patch)
tree931ef2ece2ab024503bec4f142cfc86b35525ba8 /include/video_font.h
parentac8ba84c56ebcb61ce17c2a37898b5a432d333f5 (diff)
downloadu-boot-imx-785566312551ee0c3c7e352cb93f30998ebcdd16.zip
u-boot-imx-785566312551ee0c3c7e352cb93f30998ebcdd16.tar.gz
u-boot-imx-785566312551ee0c3c7e352cb93f30998ebcdd16.tar.bz2
video: Add small 4x6 font from Linux
This font is based on Linux drivers/video/console/font_mini_4x6.c as of commit: commit bcfbeecea11c15e243f076d37d637c2598aff4fe Author: Bjarni Ingi Gislason <bjarniig@rhi.hi.is> Date: Sun Aug 12 15:05:10 2012 +0000 drivers: console: font_: Change a glyph from "broken bar" to "vertical line" I removed these lines as they are useless in U-Boot: #include <linux/font.h> #define FONTDATAMAX 1536 Whole "const struct font_desc font_mini_4x6" block This patch also adds a new configuration option to select this smaller font, CONFIG_VIDEO_FONT_4X6 , but this is disabled by default. The default setting is the regular "large" font. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'include/video_font.h')
-rw-r--r--include/video_font.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/video_font.h b/include/video_font.h
index 6e341cf..96b9edb 100644
--- a/include/video_font.h
+++ b/include/video_font.h
@@ -8,6 +8,10 @@
#ifndef _VIDEO_FONT_
#define _VIDEO_FONT_
+#ifdef CONFIG_VIDEO_FONT_4X6
+#include <video_font_4x6.h>
+#else
#include <video_font_data.h>
+#endif
#endif /* _VIDEO_FONT_ */