Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEC7BC4338F for ; Wed, 4 Aug 2021 10:23:11 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id EF12D60EB2 for ; Wed, 4 Aug 2021 10:23:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EF12D60EB2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id B542C82E0D; Wed, 4 Aug 2021 12:23:01 +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="T9KxCGD5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7E0BD82E0D; Wed, 4 Aug 2021 12:22:58 +0200 (CEST) Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) (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 29A8180725 for ; Wed, 4 Aug 2021 12:22: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=email2tema@gmail.com Received: by mail-pj1-x1033.google.com with SMTP id l19so2338071pjz.0 for ; Wed, 04 Aug 2021 03:22:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2BbqpnXI744V9HMyXrSMa6EXY7Liq4H/Y1osRLZgn+g=; b=T9KxCGD5JTvfa0yojrz/KJ52u4NUIlLtfNTc1QooJf5O6jXo7ZefrijrSJMZV6VVRp KzXKJNevz4eYCW3AiI8delMrkkOnEpV3onyd00xvTrAveeP+1F/VUyNNitIqXGrRTaQV eD9SmGk43Z/I88MCa/hGwBlOWV97+V+AH2H1KkTvNMKzMmRUKsbSM14KLKlzi8+Dyd7d mufx5313nbizzoBAaB61BNOMaw4t2tuy9ICEErqmA8g6drFzikcRlAncQaHJA9WXsRU/ ZaRl30yCvk1GcFnSJ+n5A+wKCpCizZtQdw/JUsgBJwOJp93L+ws/pnvUoikuRacDKfdu P+YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2BbqpnXI744V9HMyXrSMa6EXY7Liq4H/Y1osRLZgn+g=; b=gXO7hc0B7P+7qvSFyFjHCMUugJlA7eJh7boB+vOpf62K8VUSKou9tlls5R6r5j62Zu 6zSFQjFBuD2j/Mo0Y0PvFtkVKItEL+st3Fd+nSdgSlzZyRKcIPfUP6e5wjVx/x+5fb/A ZPbQZ+wE/sXoHEH2U0Ku422dYswtuoQ1McJ2ffYnQgpWK/K+CsrhS+gf0FIqQgwh+tNS BmgfNylSGkPxqpli/LAksO5HqhICDh/aKYOufK0hRM8DqrvfnjBahRpPr0Mpou3bU7CV highi6+bDUYajdlh6cCQifsiG5lhp4TPHkbpnOXKoPiSwXu5VFaNAn78SHN4TRu2rZXp tmUA== X-Gm-Message-State: AOAM530E0WDtKs//OhNoAbcHI8f3Hvhsvimfrf+R/s69UkSa3h1Bi/At D0g1Mpr6GnLc7R3ite8+2l8= X-Google-Smtp-Source: ABdhPJyzgivBJBEq1lm17fjD85Vgzd7HVCWXmKSykWy2lzejxlvkI77x0B+5sGFHiB6YpJLzz9bYnA== X-Received: by 2002:a17:90b:1d8c:: with SMTP id pf12mr8816752pjb.130.1628072571620; Wed, 04 Aug 2021 03:22:51 -0700 (PDT) Received: from localhost.localdomain (104.194.74.249.16clouds.com. [104.194.74.249]) by smtp.gmail.com with ESMTPSA id z14sm2291976pfr.121.2021.08.04.03.22.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Aug 2021 03:22:51 -0700 (PDT) From: Artem Lapkin X-Google-Original-From: Artem Lapkin To: narmstrong@baylibre.com Cc: u-boot@lists.denx.de, u-boot-amlogic@groups.io, xypron.glpk@gmx.de, agraf@csgraf.de, trini@konsulko.com, christianshewitt@gmail.com, art@khadas.com, nick@khadas.com, gouwa@khadas.com Subject: [PATCH 1/4] EFI: console: query_vidconsole: multiplex adaptation Date: Wed, 4 Aug 2021 18:22:14 +0800 Message-Id: <20210804102217.2419510-2-art@khadas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210804102217.2419510-1-art@khadas.com> References: <20210804102217.2419510-1-art@khadas.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean Fixed detection of vidconsole from within a multiplexed stdout string. As you know, a user can use a comma-separated list of devices to set stdin, stdout and stderr. For example, "setenv stdout serial,vidconsole" is a multiplexed string. Signed-off-by: Artem Lapkin --- lib/efi_loader/efi_console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index 3b012e1a66..2d03285f82 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -314,7 +314,7 @@ static int __maybe_unused query_vidconsole(int *rows, int *cols) struct udevice *dev; struct vidconsole_priv *priv; - if (!stdout_name || strncmp(stdout_name, "vidconsole", 10)) + if (!stdout_name || !strstr(stdout_name, "vidconsole")) return -ENODEV; stdout_dev = stdio_get_by_name("vidconsole"); if (!stdout_dev) -- 2.25.1