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>

diff --git a/arch/powerpc/cpu/mpc8xx/video.c b/arch/powerpc/cpu/mpc8xx/video.c
index 02cd0debc2831cce3f330382148a76cfd4c381e3..02a0467896c7e62df1ac9a9d42fdbd490a7b3195 100644 (file)
--- 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 8d5c63c29ef924166576d9d3793379429acfe0e4..990650c7ef3f388c3db6c5bb7fbae2d059355fce 100644 (file)
--- 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 68ba38b6b3d8955627c8ff73e382c6b12fb75762..fd2885573ca70538e6c7c23a8aa463ff455fd615 100644 (file)
--- 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 d8b0d7f5d6ff5eb2cb4b3141eb1af8be15875003..f324354c39d619b6e3741826729d9a0c56b0e8f9 100644 (file)
--- 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 7ef95199976e2b7cc77f7a2dc1d4ecff92d0ac20..6e341cf759b2c38fc156936891e49f549c62e2cd 100644 (file)
--- 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 4e544f0d7f74a3107feefd535467ce934fbf49bb..346a162f56fe7ef759d8ee5c29614fa70151f931 100644 (file)
--- 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 */