From: Anatolij Gustschin <agust@denx.de>
To: Dzmitry Sankouski <dsankouski@gmail.com>
Cc: U-Boot Mailing List <u-boot@lists.denx.de>,
Simon Glass <sjg@chromium.org>,
Julien Masson <jmasson@baylibre.com>
Subject: Re: [PATCH v8 04/10] video console: implement multiple fonts configuration
Date: Tue, 7 Mar 2023 16:22:25 +0100 [thread overview]
Message-ID: <20230307162225.4ff65990@crub> (raw)
In-Reply-To: <20230307102121.1925581-5-dsankouski@gmail.com>
On Tue, 7 Mar 2023 13:21:14 +0300
Dzmitry Sankouski dsankouski@gmail.com wrote:
...
> @@ -138,13 +139,15 @@ 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;
> -#else
> - col = 0;
> - row = 0;
> -#endif
> + if (IS_ENABLED(CONFIG_VIDEO_LOGO)) {
> + struct video_fontdata *fontdata = fonts;
> +
> + col = BMP_LOGO_WIDTH / fontdata->width + 1;
> + row = BMP_LOGO_HEIGHT / fontdata->height + 1;
> + } else {
> + col = 0;
> + row = 0;
> + }
there was another build error for boards with CONFIG_VIDEO_LOGO
disabled:
https://source.denx.de/u-boot/custodians/u-boot-video/-/jobs/589501#L1430
I changed this to
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;
--
Anatolij
next prev parent reply other threads:[~2023-03-07 15:22 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-07 10:21 [PATCH v8 00/10] vidconsole: refactoring and support for wider fonts Dzmitry Sankouski
2023-03-07 10:21 ` [PATCH v8 01/10] video console: refactoring and optimization Dzmitry Sankouski
2023-03-07 10:21 ` [PATCH v8 02/10] video console: add support for fonts wider than 1 byte Dzmitry Sankouski
2023-03-07 10:21 ` [PATCH v8 03/10] video console: move 8x16 font data in named header Dzmitry Sankouski
2023-03-07 10:21 ` [PATCH v8 04/10] video console: implement multiple fonts configuration Dzmitry Sankouski
2023-03-07 15:22 ` Anatolij Gustschin [this message]
2023-03-10 8:35 ` Dzmitry Sankouski
2023-03-10 9:24 ` Anatolij Gustschin
2023-03-07 10:21 ` [PATCH v8 05/10] video console: move vidconsole_get_font_size() logic to driver ops Dzmitry Sankouski
2023-03-07 10:21 ` [PATCH v8 06/10] video console: allow font size configuration at runtime Dzmitry Sankouski
2023-03-07 10:21 ` [PATCH v8 07/10] video console: add 12x22 Sun font from linux Dzmitry Sankouski
2023-03-07 10:21 ` [PATCH v8 08/10] video console: add 16x32 Terminus " Dzmitry Sankouski
2023-03-07 10:21 ` [PATCH v8 09/10] video console: sandbox: add 12x22 font defconfigs Dzmitry Sankouski
2023-03-07 10:21 ` [PATCH v8 10/10] video console: add 12x22 console simple font test Dzmitry Sankouski
2023-03-10 9:26 ` [PATCH v8 00/10] vidconsole: refactoring and support for wider fonts Anatolij Gustschin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230307162225.4ff65990@crub \
--to=agust@denx.de \
--cc=dsankouski@gmail.com \
--cc=jmasson@baylibre.com \
--cc=sjg@chromium.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox