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 | |
| parent | 2bc4aa522740a1b72bb814d0ddf1f9be7df82c83 (diff) | |
| download | olio-uboot-2014.01-ac8ba84c56ebcb61ce17c2a37898b5a432d333f5.tar.xz olio-uboot-2014.01-ac8ba84c56ebcb61ce17c2a37898b5a432d333f5.zip | |
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>
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/video.c | 1 | ||||
| -rw-r--r-- | common/lcd.c | 1 | ||||
| -rw-r--r-- | drivers/video/cfb_console.c | 1 | ||||
| -rw-r--r-- | drivers/video/sed156x.c | 1 | ||||
| -rw-r--r-- | include/video_font.h | 5 | ||||
| -rw-r--r-- | include/video_font_data.h | 7 |
6 files changed, 7 insertions, 9 deletions
diff --git a/arch/powerpc/cpu/mpc8xx/video.c b/arch/powerpc/cpu/mpc8xx/video.c index 02cd0debc..02a046789 100644 --- a/arch/powerpc/cpu/mpc8xx/video.c +++ b/arch/powerpc/cpu/mpc8xx/video.c @@ -109,7 +109,6 @@ DECLARE_GLOBAL_DATA_PTR; /************************************************************************/ #include <video_font.h> /* Get font data, width and height */ -#include <video_font_data.h> #ifdef CONFIG_VIDEO_LOGO #include <video_logo.h> /* Get logo data, width and height */ diff --git a/common/lcd.c b/common/lcd.c index 8d5c63c29..990650c7e 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -51,7 +51,6 @@ /* ** FONT DATA */ /************************************************************************/ #include <video_font.h> /* Get font data, width and height */ -#include <video_font_data.h> /************************************************************************/ /* ** LOGO DATA */ diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 68ba38b6b..fd2885573 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -197,7 +197,6 @@ #include <linux/types.h> #include <stdio_dev.h> #include <video_font.h> -#include <video_font_data.h> #if defined(CONFIG_CMD_DATE) #include <rtc.h> diff --git a/drivers/video/sed156x.c b/drivers/video/sed156x.c index d8b0d7f5d..f324354c3 100644 --- a/drivers/video/sed156x.c +++ b/drivers/video/sed156x.c @@ -25,7 +25,6 @@ /* include the font data */ #include <video_font.h> -#include <video_font_data.h> #if VIDEO_FONT_WIDTH != 8 || VIDEO_FONT_HEIGHT != 16 #error Expecting VIDEO_FONT_WIDTH == 8 && VIDEO_FONT_HEIGHT == 16 diff --git a/include/video_font.h b/include/video_font.h index 7ef951999..6e341cf75 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 4e544f0d7..346a162f5 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 */ |