From owner-dev-commits-src-main@freebsd.org Tue Jan 12 11:11:04 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B37054D3184; Tue, 12 Jan 2021 11:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DFSYh4lm7z4nW6; Tue, 12 Jan 2021 11:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 964512BD32; Tue, 12 Jan 2021 11:11:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10CBB4kt055781; Tue, 12 Jan 2021 11:11:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10CBB4Qf055780; Tue, 12 Jan 2021 11:11:04 GMT (envelope-from git) Date: Tue, 12 Jan 2021 11:11:04 GMT Message-Id: <202101121111.10CBB4Qf055780@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Toomas Soome Subject: git: 8b1839548750 - main - loader.efi: disable workaround for serial console on non-x86 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tsoome X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b18395487506d3602205e5844e0b67ba0c0dc80 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2021 11:11:04 -0000 The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=8b18395487506d3602205e5844e0b67ba0c0dc80 commit 8b18395487506d3602205e5844e0b67ba0c0dc80 Author: Toomas Soome AuthorDate: 2021-01-11 20:07:06 +0000 Commit: Toomas Soome CommitDate: 2021-01-12 11:09:11 +0000 loader.efi: disable workaround for serial console on non-x86 As efi console is drawn and with functional comconsole driver, we can use proper terminal emulator on efi framebuffer console. --- stand/efi/libefi/efi_console.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/stand/efi/libefi/efi_console.c b/stand/efi/libefi/efi_console.c index 533f4458c15b..1ed2be15d3d6 100644 --- a/stand/efi/libefi/efi_console.c +++ b/stand/efi/libefi/efi_console.c @@ -929,7 +929,11 @@ cons_update_mode(bool use_gfx_mode) * also just use the old emulator. RB_MULTIPLE also implies * we're using a serial console. */ +#if defined(__i386__) || defined(__amd64__) mode = parse_uefi_con_out(); +#else + mode = 0; +#endif if ((mode & (RB_SERIAL | RB_MULTIPLE)) == 0) { conout->EnableCursor(conout, FALSE); gfx_state.tg_cursor_visible = false;