Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ac8ba84c56ebcb61ce17c2a37898b5a432d333f5

Authored by Marek Vasut
Committed by Anatolij Gustschin
1 parent 2bc4aa5227
Exists in master and in 53 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

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>

Showing 6 changed files with 7 additions and 9 deletions Side-by-side Diff

arch/powerpc/cpu/mpc8xx/video.c
Diff comments   View file @ ac8ba84
... ... @@ -109,7 +109,6 @@
109 109 /************************************************************************/
110 110  
111 111 #include <video_font.h> /* Get font data, width and height */
112   -#include <video_font_data.h>
113 112  
114 113 #ifdef CONFIG_VIDEO_LOGO
115 114 #include <video_logo.h> /* Get logo data, width and height */
... ... @@ -51,7 +51,6 @@
51 51 /* ** FONT DATA */
52 52 /************************************************************************/
53 53 #include <video_font.h> /* Get font data, width and height */
54   -#include <video_font_data.h>
55 54  
56 55 /************************************************************************/
57 56 /* ** LOGO DATA */
drivers/video/cfb_console.c
Diff comments   View file @ ac8ba84
... ... @@ -197,7 +197,6 @@
197 197 #include <linux/types.h>
198 198 #include <stdio_dev.h>
199 199 #include <video_font.h>
200   -#include <video_font_data.h>
201 200  
202 201 #if defined(CONFIG_CMD_DATE)
203 202 #include <rtc.h>
drivers/video/sed156x.c
Diff comments   View file @ ac8ba84
... ... @@ -25,7 +25,6 @@
25 25  
26 26 /* include the font data */
27 27 #include <video_font.h>
28   -#include <video_font_data.h>
29 28  
30 29 #if VIDEO_FONT_WIDTH != 8 || VIDEO_FONT_HEIGHT != 16
31 30 #error Expecting VIDEO_FONT_WIDTH == 8 && VIDEO_FONT_HEIGHT == 16
include/video_font.h
Diff comments   View file @ ac8ba84
... ... @@ -8,10 +8,7 @@
8 8 #ifndef _VIDEO_FONT_
9 9 #define _VIDEO_FONT_
10 10  
11   -#define VIDEO_FONT_CHARS 256
12   -#define VIDEO_FONT_WIDTH 8
13   -#define VIDEO_FONT_HEIGHT 16
14   -#define VIDEO_FONT_SIZE (VIDEO_FONT_CHARS * VIDEO_FONT_HEIGHT)
  11 +#include <video_font_data.h>
15 12  
16 13 #endif /* _VIDEO_FONT_ */
include/video_font_data.h
Diff comments   View file @ ac8ba84
No preview for this file type