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 54F2CC4332F for ; Wed, 19 Oct 2022 11:30:23 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ED26A84F9E; Wed, 19 Oct 2022 13:27:23 +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="Pe/RCOtp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CC20985019; Wed, 19 Oct 2022 13:26:15 +0200 (CEST) Received: from mail-io1-xd30.google.com (mail-io1-xd30.google.com [IPv6:2607:f8b0:4864:20::d30]) (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 9403884FF3 for ; Wed, 19 Oct 2022 13:25:25 +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-io1-xd30.google.com with SMTP id o65so14157107iof.4 for ; Wed, 19 Oct 2022 04:25:25 -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=8nOn1SN6NAejK8hPj65UgPkefdL+aavMWlyB2DdTWAI=; b=Pe/RCOtpoSK9aNHkzI7cW83247Lzw1oZloQWkBj4auVuv6nV5RAY18s83T9zEmdaJf BR+/gY64Mng1K+r7c94u6Jfe0m9BQ35SjJ9mzsg3hsNHNoVNHd0cYb1trsaN66HUDEy1 CvKIJMqTnjkjtD0GkRaSgfBgNIkcDgvowrl6E= 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=8nOn1SN6NAejK8hPj65UgPkefdL+aavMWlyB2DdTWAI=; b=Cy6OtpPa7sNtaEtgGS4JR25IKphRb2VYl7eDeDZVTOm2AOUSY/9QDiFhdS8yAdWTKi ub9mwYBdxSbRkZvB9aEXddKJvdFVMefk1sQ5TFpZN9uX3iKfHpyhdDi3zEhk1DFeuObH qSC1XuBovv/RxfnIDPKXTQnGFQ5ixML32iCKV5PnY3hbW6+YSG3ip5FDC2ygslThH2fG Ag1Zt8OdURGnu/jq8g/UzkGEsOzUOAfmX2KTbXPw7fIlnv7jDY65rgpL61pqq8leOzkW QSzRThTJnUh1v/jQm3muqTlFOhg+Pgr05+AiRXBw4KFIIusgF6YD6qa7/B61vocoRcPa otFA== X-Gm-Message-State: ACrzQf1PsmUW2nY976AQY5+Edu1zuc1swaxzw8W227j0/dis5kHc+Yzm 0RW0epX4Qb+e5PsnIgbTfeBi118cS6xltA== X-Google-Smtp-Source: AMsMyM4a8oP7ixOH+5Z1CJUWK2a55syqVW4+j2dYUgFeNifwJsBAfwhsSGsxTzdCW8BFEA2c7g3fdg== X-Received: by 2002:a05:6638:381c:b0:364:6e0:4e98 with SMTP id i28-20020a056638381c00b0036406e04e98mr5726565jav.71.1666178703804; Wed, 19 Oct 2022 04:25:03 -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.25.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 04:25:03 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Anatolij Gustschin , Simon Glass , AKASHI Takahiro , Heinrich Schuchardt , Jason Liu , Loic Poulain , Michal Simek , Michal Suchanek , Ovidiu Panait , =?UTF-8?q?Pali=20Roh=C3=A1r?= , Rasmus Villemoes , Rui Miguel Silva , Stefan Roese , Thomas Huth , Wolfgang Denk Subject: [PATCH 28/39] video: Drop remaining references to CONFIG_LCD Date: Wed, 19 Oct 2022 05:23:45 -0600 Message-Id: <20221019112356.1042065-29-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 These rely on the old LCD implementation which is to be removed. Drop it all. Signed-off-by: Simon Glass --- README | 45 ------------------------------- cmd/bdinfo.c | 3 --- common/stdio.c | 3 --- doc/usage/environment.rst | 4 +-- include/asm-generic/global_data.h | 2 +- 5 files changed, 3 insertions(+), 54 deletions(-) diff --git a/README b/README index d1d4a62947a..ec1b50c3055 100644 --- a/README +++ b/README @@ -770,51 +770,6 @@ The following options need to be configured: - Keyboard Support: See Kconfig help for available keyboard drivers. -- LCD Support: CONFIG_LCD - - Define this to enable LCD support (for output to LCD - display); also select one of the supported displays - by defining one of these: - - CONFIG_NEC_NL6448AC33: - - NEC NL6448AC33-18. Active, color, single scan. - - CONFIG_NEC_NL6448BC20 - - NEC NL6448BC20-08. 6.5", 640x480. - Active, color, single scan. - - CONFIG_NEC_NL6448BC33_54 - - NEC NL6448BC33-54. 10.4", 640x480. - Active, color, single scan. - - CONFIG_SHARP_16x9 - - Sharp 320x240. Active, color, single scan. - It isn't 16x9, and I am not sure what it is. - - CONFIG_SHARP_LQ64D341 - - Sharp LQ64D341 display, 640x480. - Active, color, single scan. - - CONFIG_HLD1045 - - HLD1045 display, 640x480. - Active, color, single scan. - - CONFIG_OPTREX_BW - - Optrex CBL50840-2 NF-FW 99 22 M5 - or - Hitachi LMG6912RPFC-00T - or - Hitachi SP14Q002 - - 320x240. Black & white. - - MII/PHY support: CONFIG_PHY_CLOCK_FREQ (ppc4xx) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index af2e9757db5..c454e6eee18 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -124,9 +124,6 @@ int do_bdinfo(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) bdinfo_print_num_l("fdt_size", (ulong)gd->fdt_size); if (IS_ENABLED(CONFIG_DM_VIDEO)) show_video_info(); -#if defined(CONFIG_LCD) - bdinfo_print_num_l("FB base ", gd->fb_base); -#endif #if CONFIG_IS_ENABLED(MULTI_DTB_FIT) bdinfo_print_num_l("multi_dtb_fit", (ulong)gd->multi_dtb_fit); #endif diff --git a/common/stdio.c b/common/stdio.c index a6d8a4b674f..481a30486a7 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -366,9 +366,6 @@ int stdio_add_devices(void) if (IS_ENABLED(CONFIG_SPLASH_SCREEN) && IS_ENABLED(CONFIG_CMD_BMP)) splash_display(); - } else { - if (IS_ENABLED(CONFIG_LCD)) - drv_lcd_init(); } #if defined(CONFIG_KEYBOARD) && !defined(CONFIG_DM_KEYBOARD) diff --git a/doc/usage/environment.rst b/doc/usage/environment.rst index 7906ace2af6..d12bbcd85a2 100644 --- a/doc/usage/environment.rst +++ b/doc/usage/environment.rst @@ -63,8 +63,8 @@ For example, for snapper9260 you would create a text file called Example:: stdout=serial - #ifdef CONFIG_LCD - stdout+=,lcd + #ifdef CONFIG_DM_VIDEO + stdout+=,vidconsole #endif bootcmd= /* U-Boot script for booting */ diff --git a/include/asm-generic/global_data.h b/include/asm-generic/global_data.h index 2d55fe2ac0f..8ca93ac5269 100644 --- a/include/asm-generic/global_data.h +++ b/include/asm-generic/global_data.h @@ -68,7 +68,7 @@ struct global_data { * @mem_clk: memory clock rate in Hz */ unsigned long mem_clk; -#if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO) +#if defined(CONFIG_DM_VIDEO) /** * @fb_base: base address of frame buffer memory */ -- 2.38.0.413.g74048e4d9e-goog