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 /common/splash.c | |
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 'common/splash.c')
-rw-r--r-- | common/splash.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/common/splash.c b/common/splash.c index 245ff680eb..4bc54b1bf9 100644 --- a/common/splash.c +++ b/common/splash.c @@ -127,9 +127,11 @@ void splash_get_pos(int *x, int *y) #include <dm.h> #include <video_console.h> #include <video_font.h> +#include <video_font_data.h> void splash_display_banner(void) { + struct video_fontdata __maybe_unused *fontdata = fonts; struct udevice *dev; char buf[DISPLAY_OPTIONS_BANNER_LENGTH]; int col, row, ret; @@ -138,9 +140,9 @@ void splash_display_banner(void) if (ret) return; -#ifdef CONFIG_VIDEO_LOGO - col = BMP_LOGO_WIDTH / VIDEO_FONT_WIDTH + 1; - row = BMP_LOGO_HEIGHT / VIDEO_FONT_HEIGHT + 1; +#if IS_ENABLED(CONFIG_VIDEO_LOGO) + col = BMP_LOGO_WIDTH / fontdata->width + 1; + row = BMP_LOGO_HEIGHT / fontdata->height + 1; #else col = 0; row = 0; |