Consistent font data header names needed to add new fonts.
Signed-off-by: Dzmitry Sankouski dsankouski@gmail.com Reviewed-by: Simon Glass sjg@chromium.org --- Changes for v2: N/A Changes for v3: N/A Charges for v4: N/A Charges for v5: N/A Charges for v6: rebase only Charges for v7: none
include/video_font.h | 2 +- include/{video_font_data.h => video_font_8x16.h} | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) rename include/{video_font_data.h => video_font_8x16.h} (99%)
diff --git a/include/video_font.h b/include/video_font.h index 5e23f70f85..b07c07662c 100644 --- a/include/video_font.h +++ b/include/video_font.h @@ -10,7 +10,7 @@ #ifdef CONFIG_VIDEO_FONT_4X6 #include <video_font_4x6.h> #else -#include <video_font_data.h> +#include <video_font_8x16.h> #endif
#endif /* _VIDEO_FONT_ */ diff --git a/include/video_font_data.h b/include/video_font_8x16.h similarity index 99% rename from include/video_font_data.h rename to include/video_font_8x16.h index 6e64198d1a..d3d4295032 100644 --- a/include/video_font_data.h +++ b/include/video_font_8x16.h @@ -6,8 +6,8 @@ * This file contains an 8x16 bitmap font for code page 437. */
-#ifndef _VIDEO_FONT_DATA_ -#define _VIDEO_FONT_DATA_ +#ifndef _VIDEO_FONT_8X16 +#define _VIDEO_FONT_8X16
#define VIDEO_FONT_CHARS 256 #define VIDEO_FONT_WIDTH 8 @@ -4623,7 +4623,6 @@ static unsigned char __maybe_unused video_fontdata[VIDEO_FONT_SIZE] = { 0x00, /* 00000000 */ 0x00, /* 00000000 */ 0x00, /* 00000000 */ - };
#endif