diff options
| author | Marek Vasut <marex@denx.de> | 2013-07-30 23:37:57 +0200 |
|---|---|---|
| committer | Anatolij Gustschin <agust@denx.de> | 2013-08-12 22:28:41 +0200 |
| commit | ac8ba84c56ebcb61ce17c2a37898b5a432d333f5 (patch) | |
| tree | 0b1535911f151d0783f991a234a307df4144486e /include | |
| parent | 2bc4aa522740a1b72bb814d0ddf1f9be7df82c83 (diff) | |
| download | u-boot-imx-ac8ba84c56ebcb61ce17c2a37898b5a432d333f5.zip u-boot-imx-ac8ba84c56ebcb61ce17c2a37898b5a432d333f5.tar.gz u-boot-imx-ac8ba84c56ebcb61ce17c2a37898b5a432d333f5.tar.bz2 | |
video: Encapsulate font in video_font_data.h
This patch moves all the font configuration values into video_font_data.h
so they are all in the right place with the font. The video_font.h now only
includes video_font_data.h and will allow us to select and include different
font once more fonts are added.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Anatolij Gustschin <agust@denx.de>
[agust: fixed build warning for mcc200]
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/video_font.h | 5 | ||||
| -rw-r--r-- | include/video_font_data.h | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/include/video_font.h b/include/video_font.h index 7ef9519..6e341cf 100644 --- a/include/video_font.h +++ b/include/video_font.h @@ -8,9 +8,6 @@ #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) +#include <video_font_data.h> #endif /* _VIDEO_FONT_ */ diff --git a/include/video_font_data.h b/include/video_font_data.h index 4e544f0..346a162 100644 --- a/include/video_font_data.h +++ b/include/video_font_data.h @@ -8,7 +8,12 @@ #ifndef _VIDEO_FONT_DATA_ #define _VIDEO_FONT_DATA_ -static unsigned char video_fontdata[VIDEO_FONT_SIZE] = { +#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) + +static unsigned char __maybe_unused video_fontdata[VIDEO_FONT_SIZE] = { /* 0 0x00 '^@' */ 0x00, /* 00000000 */ |