From patchwork Sun Feb 28 17:22:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1445285 X-Patchwork-Delegate: xypron.glpk@gmx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=YHuKQdLh; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DpVbq6vK0z9sVF for ; Mon, 1 Mar 2021 04:23:24 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 75FF4806C5; Sun, 28 Feb 2021 18:23:12 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de 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; secure) header.d=gmx.net header.i=@gmx.net header.b="YHuKQdLh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A5DE3808B2; Sun, 28 Feb 2021 18:23:10 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F1C9180598 for ; Sun, 28 Feb 2021 18:23:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1614532961; bh=XtBdfNmaEoskQg7CYkGpbUpSznkJYVH1K2WDocuEsp0=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=YHuKQdLhfHdg0On5hzQG5ujzlr0SMC2llj4YXLSk2eTANjLM0BRUn37eMVEBuw6ia xpsshmUXxdR7gkqcJIQ4rYwDE1AOPYyiOUL2RciE3pkN7ArRkY4vvt5G+JYHhln28B af6WZFi3P/orhZ2WHU+0J8Id+cOEOt3bZFFT2A5Y= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from lorawanserver.fritz.box ([62.143.246.89]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MHoRK-1l3mzP1kla-00EsSl; Sun, 28 Feb 2021 18:22:41 +0100 From: Heinrich Schuchardt To: Alexander Graf Cc: u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/1] efi_loader: console size of vidconsole Date: Sun, 28 Feb 2021 18:22:36 +0100 Message-Id: <20210228172236.1200-1-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:cmAf8UMD8nOEwzrGr77ZQOxJ3UQF+Lw3/YDAD6F3K2gfpx4jC7W MmA1KAuICrFWUAXMK+9qYpvVKb8DkgFqLHiNN+OJpHkR4tuKiU7llDatuXZt/I73AaZ72co 3Dr6EsOxxU8rV3+zqk2wG+kKuytiAXkgt1N7PfxMY7Tn8rG9wIbiqgq9B+2Dr+P+h8v/aNh KTe/dYF9Aw2aICU0NrA8w== X-UI-Out-Filterresults: notjunk:1;V03:K0:vgLHsRvUioQ=:Uzdps6doUAZGM8Tw5WT6Hc 64Y1alPNjjNCHGqMShK57MbcmmUlCCmAu3x+Ow1VqJqpO0xMnOVsQZnK+iwRZ2mwjM4234NDu GDHt0qGjTPIufoR2F/YnwWbzeQ6Ub2Th9uZtIdDtNoqXsEmlaeICu7QGEnKkjQL5evHrOy/cQ jrOO/9BsUp8aqMbdvaoF+4wTYBgwukuMRS5+WCl0fADEaYMjOM0SG6Dhlt8se0VQiiE88bI50 QcpK3wjdGJRvIo+91Ks4dBOJnj8foBoxvNOgNmHtp1gtlpzbIidKAOmBeBea3d+o4dQeSfUZJ 6bo+MAzZA2G2ZEuKx4zSfu7a7EGwG9SASnYpPCtbJFB1pAE3k+oxA0tjIrKTM5CB9GFr3xBl9 NzICbiqodVisCl+D0O7J7Ug1Kz1S2fYfcEXCyGGXHe2iUinJsbM1MxRaLVCdqyvlcdFbYhy1I nQ58ALZcI8TYDqV+iHViqTeacqeXq7cukxsaOgJBUONF4dSarFFKK9iRXbPXm48fT97L106RE KDCFC37PO/YY5sfA09iQXABgYBVuWjUcyy37ZK4NDjq0tH8O+benOwO+egT77lIbumMdkRDRQ ITQEgULf0XMHj5sDVCRBiW3a+XPjRgYXpqOdEG+E7jZ40IXlym5iUxM9LgarLa4YHSjojcSNZ Ljm1S9i/SG3G/vXBafHLLNsGIjo/QU8K33FF8BrLY5Xj4HuhXtkYiB8fDAmOJdr1zw488dFho q36aEX2hFyAA2/o2YPSgmzxOTuQazwNzTE6lBtFnVSs4yblLIpz3L1k0RLdQN5ckgREw+CRP2 VY/Cm2zBrPIYLNoQyZCzcWjYuplJbxWwGhxXmGZ7Vt1j3gsAkLLt9cSd4L81eJlS9MF61Kq67 GOXh1/yhCKNi4jyff/Ow== 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.102.4 at phobos.denx.de X-Virus-Status: Clean If stdout is 'vidconsole' we correctly set the console size. If stdout is 'vidconsole,serial' the video console is ignored. We should always evaluate the size of vidconsole if it is the primary console. Signed-off-by: Heinrich Schuchardt --- lib/efi_loader/efi_console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.1 diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index edcfce7bec..c4003554c2 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -311,7 +311,7 @@ static void query_console_size(void) const char *stdout_name = env_get("stdout"); int rows = 25, cols = 80; - if (stdout_name && !strcmp(stdout_name, "vidconsole") && + if (stdout_name && !strncmp(stdout_name, "vidconsole", 10) && IS_ENABLED(CONFIG_DM_VIDEO)) { struct stdio_dev *stdout_dev = stdio_get_by_name("vidconsole");