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 6693FC4332F for ; Wed, 19 Oct 2022 11:27:19 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 047B584FF9; Wed, 19 Oct 2022 13:25:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org 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=chromium.org header.i=@chromium.org header.b="A/uapdsj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 45E8384FF4; Wed, 19 Oct 2022 13:25:26 +0200 (CEST) Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id C4AF184FB8 for ; Wed, 19 Oct 2022 13:24:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x12b.google.com with SMTP id 8so8988210ilj.4 for ; Wed, 19 Oct 2022 04:24:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=M5XkOArkkaTf4OUL7RrctIL2ASHfIMZIdUprx9ahvQE=; b=A/uapdsjaWGF9Cd14ErJU+Apa4FYKjOrec+O1u4vwvOUOKTMi/9cvQSg/e51q9n5+b KFhSa7jqHJ40PgDCL67Umb5kWDltki+MfTf5iCD+IHvyQRTIGEHYOEakIHOZiKa3Jl4r SHAJUT+rYycR15hi94vj6pKt08b2DJr5QsXbU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M5XkOArkkaTf4OUL7RrctIL2ASHfIMZIdUprx9ahvQE=; b=SIqfHD5CDkVGwXDSlJc6uTjrO4B6heBfmaFaBEQuANAVaLVdWiXGOOIl0jXSDGaRIU ukzE2mO+VkDgPuL1ZhkTdDVhec1NvUJLanprfvZMfJ4f1j9rLar6lLtK/ar4Lc0uvRct v2HH0QYNW2svOMoMag1YrYDzdCeY/uoNSsT/xC4bBvVsCz9twL9g3mHUD+QIH1cTJO37 1aXT/NE7CsPwh6ZqD0BwH3Too1b4s7VYdv2656ycFCvP+eK/XZjo89W3ZZK4kcjf5e1n 2CkQIMmOJNM72phB+QhFE5/DaYXnLlOGIrfUCXsrjkFO94gyi8/ialXnFxyn7HLA45DO L2fA== X-Gm-Message-State: ACrzQf2xM9XxLxgIX47Bv2P4PTbpuQYtvpj4Lyi9kPsqWwl6D9WBlSYf 4tW5JVa1J43lDZZp7hXC+SRhbqD1WHGpPg== X-Google-Smtp-Source: AMsMyM6IaENwbNIPhpycpdMkkl1lahug+tkCib0y2fllxU6RIPfY5hW6EvypTIATkUz7zp8adpC7dw== X-Received: by 2002:a92:ca0c:0:b0:2f9:204:7a0d with SMTP id j12-20020a92ca0c000000b002f902047a0dmr5834962ils.194.1666178685132; Wed, 19 Oct 2022 04:24:45 -0700 (PDT) Received: from sjg1.roam.corp.google.com (c-67-190-102-125.hsd1.co.comcast.net. [67.190.102.125]) by smtp.gmail.com with ESMTPSA id g34-20020a022722000000b003634aa4a55asm2041156jaa.82.2022.10.19.04.24.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 04:24:44 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Anatolij Gustschin , Simon Glass , Heinrich Schuchardt , Stefan Roese Subject: [PATCH 08/39] video: Drop CONFIG_LCD_INFO_BELOW_LOGO Date: Wed, 19 Oct 2022 05:23:25 -0600 Message-Id: <20221019112356.1042065-9-sjg@chromium.org> X-Mailer: git-send-email 2.38.0.413.g74048e4d9e-goog In-Reply-To: <20221019112356.1042065-1-sjg@chromium.org> References: <20221019112356.1042065-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.6 at phobos.denx.de X-Virus-Status: Clean This option is not used anymore since the LCD implementation is being removed. Drop it. Signed-off-by: Simon Glass --- api/api_display.c | 2 +- common/lcd.c | 6 +----- common/lcd_console.c | 2 +- drivers/video/Kconfig | 4 ---- include/lcd.h | 5 +---- 5 files changed, 4 insertions(+), 15 deletions(-) diff --git a/api/api_display.c b/api/api_display.c index 4f2cdd7330e..84debac48af 100644 --- a/api/api_display.c +++ b/api/api_display.c @@ -10,7 +10,7 @@ #include /* Get font width and height */ /* lcd.h needs BMP_LOGO_HEIGHT to calculate CONSOLE_ROWS */ -#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO) +#if defined(CONFIG_LCD_LOGO) #include #endif diff --git a/common/lcd.c b/common/lcd.c index 2134e603243..53ff8dd7444 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -178,7 +178,7 @@ void lcd_clear(void) } lcd_logo(); -#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO) +#if defined(CONFIG_LCD_LOGO) addr = (ulong)lcd_base + BMP_LOGO_HEIGHT * lcd_line_length; lcd_init_console((void *)addr, panel_info.vl_col, panel_info.vl_row, panel_info.vl_rot); @@ -209,11 +209,7 @@ static int lcd_init(void *lcdbase) /* Initialize the console */ lcd_set_col(0); -#ifdef CONFIG_LCD_INFO_BELOW_LOGO - lcd_set_row(7 + BMP_LOGO_HEIGHT / VIDEO_FONT_HEIGHT); -#else lcd_set_row(1); /* leave 1 blank line below logo */ -#endif return 0; } diff --git a/common/lcd_console.c b/common/lcd_console.c index ed36c78440c..cde96deb3c2 100644 --- a/common/lcd_console.c +++ b/common/lcd_console.c @@ -125,7 +125,7 @@ static inline void console_newline(void) void console_calc_rowcol(struct console_t *pcons, u32 sizex, u32 sizey) { pcons->cols = sizex / VIDEO_FONT_WIDTH; -#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO) +#if defined(CONFIG_LCD_LOGO) pcons->rows = (pcons->lcdsizey - BMP_LOGO_HEIGHT); pcons->rows /= VIDEO_FONT_HEIGHT; #else diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 02220399cb4..749fea3ffdb 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -729,10 +729,6 @@ config LCD_LOGO bool "Show a logo on screen" depends on LCD -config LCD_INFO_BELOW_LOGO - bool "Show LCD info below the on-screen logo" - depends on LCD_INFO && LCD_LOGO - config VIDEO_DW_HDMI bool help diff --git a/include/lcd.h b/include/lcd.h index 4f180692781..751b0032efc 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -144,10 +144,7 @@ void lcd_sync(void); #define LCD_COLOR16 4 #define LCD_COLOR32 5 -#if defined(CONFIG_LCD_INFO_BELOW_LOGO) -#define LCD_INFO_X 0 -#define LCD_INFO_Y (BMP_LOGO_HEIGHT + VIDEO_FONT_HEIGHT) -#elif defined(CONFIG_LCD_LOGO) +#if defined(CONFIG_LCD_LOGO) #define LCD_INFO_X (BMP_LOGO_WIDTH + 4 * VIDEO_FONT_WIDTH) #define LCD_INFO_Y VIDEO_FONT_HEIGHT #else -- 2.38.0.413.g74048e4d9e-goog