From patchwork Thu Mar 31 10:03:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: qianfan X-Patchwork-Id: 1611651 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.a=rsa-sha256 header.s=s110527 header.b=enJC3pbj; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KTf5k6gKfz9sG9 for ; Thu, 31 Mar 2022 21:03:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4CDB5841F2; Thu, 31 Mar 2022 12:03:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b="enJC3pbj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8D6A5841E5; Thu, 31 Mar 2022 12:03:31 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from m12-16.163.com (m12-16.163.com [220.181.12.16]) by phobos.denx.de (Postfix) with ESMTP id 4449C83BFA for ; Thu, 31 Mar 2022 12:03:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=qianfanguijin@163.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=/NjpNhho21pDafT7th PY90ZxwRIbdtIVVCI5DUAEfvc=; b=enJC3pbjkDJG3LIFcYq/s4uVOJwoF9x9M0 U2kVWP/4FjYcKQKz/4g5M5nueRdGd1IOvbFOo/39PlELe7qyytsHh/tzdFRwRtH8 +QkghfmeLi07ZwLEueM+qzn9z4EOmHGtHZ1mKgStsrmVwNOurKYzqnzyUsmr6TOS EgwF8XclQ= Received: from localhost.localdomain (unknown [218.201.129.19]) by smtp12 (Coremail) with SMTP id EMCowADn9+tYfEVi_oj4AA--.12036S2; Thu, 31 Mar 2022 18:03:13 +0800 (CST) From: qianfanguijin@163.com To: u-boot@lists.denx.de Cc: Anatolij Gustschin , qianfan Zhao Subject: [PATCH v2 1/3] video: Add VIDEO_FONT_4x6 to Kconfig add fix compile waring Date: Thu, 31 Mar 2022 18:03:00 +0800 Message-Id: <20220331100302.23948-1-qianfanguijin@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: EMCowADn9+tYfEVi_oj4AA--.12036S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Kr48Gr1fGr4xCr43tFy3CFg_yoW8Gw4Dpa nayryFgFWkJay3Ca17A3sagFW5tws7GrW5KayUWwn5u3W5A3s8XrWqgFy7trykXrs7J3yY qry3WF4UWF1UXFUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zi2jgfUUUUU= X-Originating-IP: [218.201.129.19] X-CM-SenderInfo: htld0w5dqj3xxmlqqiywtou0bp/1tbiGhTU7VaEAs4ULAABsQ 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.5 at phobos.denx.de X-Virus-Status: Clean From: qianfan Zhao CONFIG_VIDEO_FONT_4x6 is referenced in include/video_font.h, but doesn't has a Kconfig configuration. Add it. Signed-off-by: qianfan Zhao --- drivers/video/Kconfig | 15 +++++++++++++++ include/video_font_4x6.h | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index e2cf1e752f..adc620682e 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -138,6 +138,21 @@ config CONSOLE_NORMAL CONFIG_CONSOLE_ROTATION for that). A built-in 8x16 font is used for the display. +choice + prompt "bitmap video font" + default VIDEO_FONT_8X16 + depends on CONSOLE_NORMAL + help + Select the default bitmap font. + +config VIDEO_FONT_4X6 + bool "4x6" + +config VIDEO_FONT_8X16 + bool "8x16" + +endchoice + config CONSOLE_ROTATION bool "Support rotated displays" depends on DM_VIDEO diff --git a/include/video_font_4x6.h b/include/video_font_4x6.h index c7e6351b64..65dd5e8c1d 100644 --- a/include/video_font_4x6.h +++ b/include/video_font_4x6.h @@ -46,7 +46,7 @@ __END__; #define VIDEO_FONT_HEIGHT 6 #define VIDEO_FONT_SIZE (VIDEO_FONT_CHARS * VIDEO_FONT_HEIGHT) -static unsigned char video_fontdata[VIDEO_FONT_SIZE] = { +static unsigned char __maybe_unused video_fontdata[VIDEO_FONT_SIZE] = { /*{*/ /* Char 0: ' ' */