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_4x6.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_4x6.h')
| -rw-r--r-- | include/video_font_4x6.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/include/video_font_4x6.h b/include/video_font_4x6.h index c7e6351b64..1b8c02510b 100644 --- a/include/video_font_4x6.h +++ b/include/video_font_4x6.h @@ -38,15 +38,12 @@ __END__; MSBit to LSBit = left to right. */ -#ifndef _VIDEO_FONT_DATA_ -#define _VIDEO_FONT_DATA_ +#ifndef _VIDEO_FONT_4X6_ +#define _VIDEO_FONT_4X6_ -#define VIDEO_FONT_CHARS 256 -#define VIDEO_FONT_WIDTH 4 -#define VIDEO_FONT_HEIGHT 6 -#define VIDEO_FONT_SIZE (VIDEO_FONT_CHARS * VIDEO_FONT_HEIGHT) +#include <video_font_data.h> -static unsigned char video_fontdata[VIDEO_FONT_SIZE] = { +static unsigned char video_fontdata_4x6[VIDEO_FONT_SIZE(256, 4, 6)] = { /*{*/ /* Char 0: ' ' */ |