diff options
| author | Tom Rini <trini@ti.com> | 2013-08-12 18:06:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-08-12 18:06:30 -0400 |
| commit | c15438eaea8b854d89455ebf7a1c7c4f06fa92f5 (patch) | |
| tree | 1b9f2cddd85c061fb0377681d1fee0a2904d738d /include/video_font.h | |
| parent | d62a89bd5b5033649a90fa5bfe0f5b32013ca8f8 (diff) | |
| parent | 1dc793dd2b8fb97dddf437547d86bd5bcfdb8b29 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-video
Diffstat (limited to 'include/video_font.h')
| -rw-r--r-- | include/video_font.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/video_font.h b/include/video_font.h index 7ef95199976..96b9edb0da1 100644 --- a/include/video_font.h +++ b/include/video_font.h @@ -8,9 +8,10 @@ #ifndef _VIDEO_FONT_ #define _VIDEO_FONT_ -#define VIDEO_FONT_CHARS 256 -#define VIDEO_FONT_WIDTH 8 -#define VIDEO_FONT_HEIGHT 16 -#define VIDEO_FONT_SIZE (VIDEO_FONT_CHARS * VIDEO_FONT_HEIGHT) +#ifdef CONFIG_VIDEO_FONT_4X6 +#include <video_font_4x6.h> +#else +#include <video_font_data.h> +#endif #endif /* _VIDEO_FONT_ */ |