diff options
author | Tom Rini <trini@konsulko.com> | 2023-03-07 20:54:01 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-03-07 20:54:01 +0300 |
commit | 70ed05ce6c051e55e126e67e72ab20409134c953 (patch) | |
tree | c18e478b83cb9adcc703c060a89d6d00028f15fe /include/video_font.h | |
parent | 36bb622df5ba391271043416c234dd5544a0199f (diff) | |
parent | 72471620e82758b6cbdb9f70d775c0c18b043794 (diff) | |
download | u-boot-70ed05ce6c051e55e126e67e72ab20409134c953.tar.xz |
Merge tag 'next-20230307' of https://source.denx.de/u-boot/custodians/u-boot-video into next
- video console refactoring and optimization
- support for fonts wider than 1 byte
- use named header for 8x16 font data
- support multiple fonts configuration
- move get_font_size() to truetype driver ops
- support font size configuration at runtime
- add 16x32 Terminus font from linux
- add 12x22 Sun font from linux
- add 12x22 console simple font test
Diffstat (limited to 'include/video_font.h')
-rw-r--r-- | include/video_font.h | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/include/video_font.h b/include/video_font.h index 5e23f70f85..05d3f989a7 100644 --- a/include/video_font.h +++ b/include/video_font.h @@ -7,10 +7,35 @@ #ifndef _VIDEO_FONT_ #define _VIDEO_FONT_ -#ifdef CONFIG_VIDEO_FONT_4X6 -#include <video_font_4x6.h> -#else #include <video_font_data.h> + +#if defined(CONFIG_VIDEO_FONT_4X6) +#include <video_font_4x6.h> +#endif +#if defined(CONFIG_VIDEO_FONT_8X16) +#include <video_font_8x16.h> +#endif +#if defined(CONFIG_VIDEO_FONT_SUN12X22) +#include <video_font_sun12x22.h> +#endif +#if defined(CONFIG_VIDEO_FONT_16X32) +#include <video_font_ter16x32.h> +#endif + +static struct video_fontdata __maybe_unused fonts[] = { +#if defined(CONFIG_VIDEO_FONT_8X16) + FONT_ENTRY(8, 16, 8x16), +#endif +#if defined(CONFIG_VIDEO_FONT_4X6) + FONT_ENTRY(4, 6, 4x6), +#endif +#if defined(CONFIG_VIDEO_FONT_SUN12X22) + FONT_ENTRY(12, 22, 12x22), +#endif +#if defined(CONFIG_VIDEO_FONT_16X32) + FONT_ENTRY(16, 32, 16x32), #endif + {/* list terminator */} +}; #endif /* _VIDEO_FONT_ */ |