From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2F299C6FD1E for ; Tue, 7 Mar 2023 15:22:29 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A8D1A85B82; Tue, 7 Mar 2023 16:22:27 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1678202548; bh=GH6DX6AU2cOr9Irs2QaW4Wac9frIC/yJQuGmQf3MCqg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=S99Uf/YLPdmJ4+QqWR0xYJc3LYpGKunIXWPexQsqtmWTX8V5UhuGZKWRgaaNoNvO+ j3pi520aVJDbGVTpODWfWQCMFxDl1jCyHkbL/qXFSwrbadccF0XeqfkmTjSxMAtwBp KkoEiV6siEiHY28kkT2rLhRZfLDh6KxSH3xRjm923kw4vEnTENamOs5Ed6A691bQfe JnDrpeoAs3exDyDo9cO0S5ZOg0UsK4nc0W9CdXKQ+7DOrZH1F30EJ7Rpzz0NtIxUKZ EWELI58wisy8+NA8rLutZI2TK2h4y8OLAs6ietRK4dk18Rj+A8qJsFfbQLPkflx2ey 62kuHiFzZVN4w== Received: from crub (p508b636f.dip0.t-ipconnect.de [80.139.99.111]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: agust@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 5B5C385C00; Tue, 7 Mar 2023 16:22:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1678202546; bh=GH6DX6AU2cOr9Irs2QaW4Wac9frIC/yJQuGmQf3MCqg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=NUoA7SME56BiaBupKkqFRqtZx20vy6yk+Nbwr2+2+s/Lw0SE/UL3MlfCiTkBRLfkJ 2t6+Hxf/YJ8g3wSrzv6Onrfz2pxd+3VITPcxvtct69OIhgtJsI3S+j6xGzOEJJ4rMA kJtifThnSAyfme70JQZ0VMKlgK6e57ZutdbiA8/ZhJUdSpwopLferZ9gGH2MCPoKKP 4p4WHFxD1N/zsZ6bfxIDd8Dxr6MWxUrAVqW6vJqEsMtrjdAMRT1lNJKvNS+d8AnY5y OqTWyVqLnwPWfEAR/rIQ3r+UBJQrCnmCp7pFpaj92OTf5CYBAwmSdqZQ1wZxe635+s 1HAmGYJmtixmg== Date: Tue, 7 Mar 2023 16:22:25 +0100 From: Anatolij Gustschin To: Dzmitry Sankouski Cc: U-Boot Mailing List , Simon Glass , Julien Masson Subject: Re: [PATCH v8 04/10] video console: implement multiple fonts configuration Message-ID: <20230307162225.4ff65990@crub> In-Reply-To: <20230307102121.1925581-5-dsankouski@gmail.com> References: <20230307102121.1925581-1-dsankouski@gmail.com> <20230307102121.1925581-5-dsankouski@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean 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