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 A1468C433FE for ; Wed, 19 Oct 2022 11:25:23 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1380184FD2; Wed, 19 Oct 2022 13:24:56 +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="AMk/B23b"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 40FFE84FAF; Wed, 19 Oct 2022 13:24:48 +0200 (CEST) Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (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 56B2A84F8D for ; Wed, 19 Oct 2022 13:24:40 +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-xd33.google.com with SMTP id n73so14119137iod.13 for ; Wed, 19 Oct 2022 04:24:40 -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=jGKdrCGI1eaJYlsS9H5UsYxGCyPtCcbsM9hlZZj7+EE=; b=AMk/B23bWDAMV89tYLhA+hcg9Mc5sJ00DpRY4mORPLjHjtRTvB82QjNGKmeR1g73mq OqLOppsNXkSIOjBjyWGiP88drs+0s7WIPvS3aVY8JZs2xSgJqF2MxbZEa1wrEcZZJi4E j16k2H1Xel7dYiTIe3bFHVPMP36rmVl4C6yjQ= 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=jGKdrCGI1eaJYlsS9H5UsYxGCyPtCcbsM9hlZZj7+EE=; b=fQUGQJS1s5vPkTuzYElG+dA4IVEnOvFTy85FmhNrh1fojPAMu7SrSOUmRn5S2B0wJ3 L0F9axFdvoElATOFxvgdXuRr+uVILPn5uF0ASyF4DsS0+/lF4c17E5KWPRZ15PRWE5xr KZhdwd2ec/wEBqid1FrrCEgLXHDNYVr/iKFX73DUMlZAzYId2r3tDurCilAZsSsnbvEC CRXcYwkpkY9n2M1Mps1gnenPKF/iaD8MQldwS71YcYHeUCHJ+IqNwqz+lHNF54GrtXA/ TKym6gGjlrrMuYMqlER9GgE/giL+75rtLAJ1shA8yPaeqZvY63EzP/IC1lDHfFWdyoyl zyGg== X-Gm-Message-State: ACrzQf35wTNRArDP0Sbvh21sa6vgY4vSy+X//jB3+Wl1m09np4ahN1w8 meLRfxgQO/6n9HxKuGO5/lzXcMinpi/1Fw== X-Google-Smtp-Source: AMsMyM54948YYOxqToH6UNhb6/zMPTYUbcOqlCX+SoAULk10hjk+LFiTae52BVUSkBIzcXIw68WvkQ== X-Received: by 2002:a05:6638:268a:b0:365:c728:9bb4 with SMTP id o10-20020a056638268a00b00365c7289bb4mr6033769jat.303.1666178678630; Wed, 19 Oct 2022 04:24:38 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Oct 2022 04:24:38 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Anatolij Gustschin , Simon Glass , Huan 'Kitty' Wang , Ian Ray , Martyn Welch , Patrick Delaunay , Stefan Roese , Tim Harvey Subject: [PATCH 02/39] Convert CONFIG_HIDE_LOGO_VERSION to Kconfig Date: Wed, 19 Oct 2022 05:23:19 -0600 Message-Id: <20221019112356.1042065-3-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 converts the following to Kconfig: CONFIG_HIDE_LOGO_VERSION Signed-off-by: Simon Glass --- configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + drivers/video/Kconfig | 9 +++++++++ include/configs/ge_b1x5v2.h | 1 - include/configs/ge_bx50v3.h | 1 - include/configs/gw_ventana.h | 1 - scripts/config_whitelist.txt | 1 - 8 files changed, 12 insertions(+), 4 deletions(-) diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index 01a4d28caf6..7a5cea597dc 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -162,6 +162,7 @@ CONFIG_I2C_EDID=y CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y +CONFIG_HIDE_LOGO_VERSION=y CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_IMX_WATCHDOG=y CONFIG_FDT_FIXUP_PARTITIONS=y diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index fb5870fa580..a7fa6670dd1 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -166,6 +166,7 @@ CONFIG_I2C_EDID=y CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y +CONFIG_HIDE_LOGO_VERSION=y CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_IMX_WATCHDOG=y CONFIG_FDT_FIXUP_PARTITIONS=y diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index 9f38dfabb67..0c49a27f82c 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -172,6 +172,7 @@ CONFIG_I2C_EDID=y CONFIG_VIDEO_IPUV3=y CONFIG_SPLASH_SCREEN=y CONFIG_SPLASH_SCREEN_ALIGN=y +CONFIG_HIDE_LOGO_VERSION=y CONFIG_WATCHDOG_TIMEOUT_MSECS=60000 CONFIG_IMX_WATCHDOG=y CONFIG_FDT_FIXUP_PARTITIONS=y diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 0af94e90706..8c110639dbc 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -867,6 +867,15 @@ config SPLASH_SCREEN_ALIGN => vertically centered image at x = dspWidth - bmpWidth - 9 +config HIDE_LOGO_VERSION + bool "Hide the version information on the splash screen" + help + Normally the U-Boot version string is shown on the display when the + splash screen is enabled. This information is not otherwise visible + since video starts up after U-Boot has displayed the initial banner. + + Enable this option to hide this information. + config SPLASH_SOURCE bool "Control the source of the splash image" help diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h index 95ba20c686b..176f80bb09b 100644 --- a/include/configs/ge_b1x5v2.h +++ b/include/configs/ge_b1x5v2.h @@ -34,7 +34,6 @@ #define CONFIG_USBD_HS /* Video */ -#define CONFIG_HIDE_LOGO_VERSION #define CONFIG_IMX_VIDEO_SKIP /* Memory */ diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index ad00769bdee..ab8c66f263d 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -103,7 +103,6 @@ #define CONFIG_SYS_FSL_USDHC_NUM 3 /* Framebuffer */ -#define CONFIG_HIDE_LOGO_VERSION #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 82076ff74ff..bba64af2c91 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -47,7 +47,6 @@ /* Framebuffer and LCD */ #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_HIDE_LOGO_VERSION /* Custom config to hide U-boot version */ /* Miscellaneous configurable options */ #define CONFIG_HWCONFIG diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 137b7f61ac1..3cace62682c 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -64,7 +64,6 @@ CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_UMS_PRODUCT_NUM CONFIG_G_DNL_UMS_VENDOR_NUM CONFIG_HDMI_ENCODER_I2C_ADDR -CONFIG_HIDE_LOGO_VERSION CONFIG_HIKEY_GPIO CONFIG_HOSTNAME CONFIG_HPS_ALTERAGRP_DBGATCLK -- 2.38.0.413.g74048e4d9e-goog