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 01C75C433EF for ; Mon, 28 Mar 2022 19:41:01 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 71B9A83F6D; Mon, 28 Mar 2022 21:40:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="OrjmzszU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B233F83F74; Mon, 28 Mar 2022 21:40:56 +0200 (CEST) Received: from mail-oa1-x2a.google.com (mail-oa1-x2a.google.com [IPv6:2001:4860:4864:20::2a]) (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 9100683F6B for ; Mon, 28 Mar 2022 21:40:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-dee0378ce7so6004555fac.4 for ; Mon, 28 Mar 2022 12:40:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WcBXql+Dpe563V6OhiNVg27hVvIMO/v4tL3MudJ4EiY=; b=OrjmzszU/m/2335Wx5HkvBjajBfmkLlLJm684qh6jI8H/Gb2gK4+rbpq5PR87Z4QAp G2ar7cw9btzcoUnAHK0Ws6/W/bAHOyEWA91AsG2N2+yQUrZdUGRSdD0v0JdJ00Ki/vhL dWWwj3CBA5EQ4D6cIVXWepsalNOWjjxxMBMXxwI/HMcxl0+kNhvRo4utSMln90vDPMLN D3qcMV/c/MB04AzJqGFEE3uIQW3IpDy7OC2W236XlUuBV7ZYtrPJ+lPrvDOFLvwIPWxD +K/1ZydWrM1vVQZdlQVh9L0qS8R72ZN3dkkStFjR0sUXWqsaOJrH1ZbTUMIRsGfmLwP2 MUHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=WcBXql+Dpe563V6OhiNVg27hVvIMO/v4tL3MudJ4EiY=; b=N5yamfpT+SopLIwUgPS3FtJ62jb4Pfb4SIomaB8joEboV73kiMa83kqWgpCtsKhss+ 9He++jMJUIqxZBoC3CS9ABak14sr+mZcT3CrmCZ9yC3p0p/UZXi5D0mCZEp3nOGyaW7s Lup6D4imYEXYxxw1KH0iXzdVWap+NpSiyQQvyP3Cd30Jex9nVMRqSaeRswWVFEVkEc4V IsNEx2uAYE27PlYa/D+5+n4op3Oy6leeE8ZjfBn5TJGjILMw0qiURlnejwNJ+p3Psz23 AfzBLyOy4PN50eeFXQQnZt4evv7gkEsnDRmGhIduMJ85yGKXYUgIyj4ZpLuvb6hzOjLX Oeug== X-Gm-Message-State: AOAM533LwyHemzDQsw/wrI8HgibYIfxBmEevHwkm0cqf+RG6nysyyvTy KGma8W1QDv+xL1tEt8QpAgM= X-Google-Smtp-Source: ABdhPJxP9SJMKCKPwUMIEdgWuSsVPbykLEpiUvwqoXFyqi181eNiu+yNiTrjz6C9mrH9bEO943g9Dg== X-Received: by 2002:a05:6870:17a1:b0:da:b3f:2b79 with SMTP id r33-20020a05687017a100b000da0b3f2b79mr398913oae.280.1648496452241; Mon, 28 Mar 2022 12:40:52 -0700 (PDT) Received: from localhost.localdomain ([2804:14c:485:4b69:ebb1:5e0f:323c:dda3]) by smtp.gmail.com with ESMTPSA id a30-20020a4ad1de000000b00320fccd02cfsm7443762oos.5.2022.03.28.12.40.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Mar 2022 12:40:51 -0700 (PDT) From: Fabio Estevam To: agust@denx.de Cc: u-boot@lists.denx.de, tharvey@gateworks.com, sjg@chromium.org, trini@konsulko.com, Fabio Estevam Subject: [PATCH] video: Do not show splash and U-Boot logo simultaneously Date: Mon, 28 Mar 2022 16:40:36 -0300 Message-Id: <20220328194036.1421266-1-festevam@gmail.com> X-Mailer: git-send-email 2.25.1 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.5 at phobos.denx.de X-Virus-Status: Clean From: Fabio Estevam Currently, on imx6sabresd and gwventana boards, the company logo and U-Boot logo are shown. The correct behavior is to show only the company logo, if available, and not both logos. Reported-by: Tim Harvey Signed-off-by: Fabio Estevam --- drivers/video/video-uclass.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index 88797d4a21c2..42f9245ea8c5 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -407,7 +407,8 @@ static int video_post_probe(struct udevice *dev) return ret; } - if (IS_ENABLED(CONFIG_VIDEO_LOGO) && !plat->hide_logo) { + if (IS_ENABLED(CONFIG_VIDEO_LOGO) && + !IS_ENABLED(CONFIG_SPLASH_SCREEN) && !plat->hide_logo) { ret = show_splash(dev); if (ret) { log_debug("Cannot show splash screen\n"); -- 2.25.1