From nobody Fri Jan 14 13:42:12 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 404411940C44; Fri, 14 Jan 2022 13:42:16 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jb2Xm07TCz50RF; Fri, 14 Jan 2022 13:42:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642167736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A70dFB2aClGceqxB7RQZWuJWtmeJs6VHK7MKM4v9pDw=; b=OgkpsaRWixnFQMjUm8hCBlarpVTZmdtE3UA9VHtDNLEwMIKcwMrRGl3UJfIBnyMpRBh4Sb H29QxgOWOJjLPckoQkGh0oEPDy5uO9XJspl/+BWDRCPt4JydZAVHalhNKKQ7dHy04l2Lgf 7bzX6SkUdDKIO6v9TtSJ1dchlGTwvN3dzOuD0bmOz4ZKi5fnevarblBQc0ux9VVrWxlsKl RMKZ4Em04YyK/gYEPT3i7T9z+3j3le0ph0jRcynVxj9qpoiAWS6h9UQXhUKisMXoV7Gcc6 W9XpbWfkze376De2TcIvdZEyG61+qumMPrqHU8CFDLQT1QGsTRBUlCbAPv8CpA== 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 36A4A146FB; Fri, 14 Jan 2022 13:42:12 +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 20EDgCth034441; Fri, 14 Jan 2022 13:42:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20EDgCGL034440; Fri, 14 Jan 2022 13:42:12 GMT (envelope-from git) Date: Fri, 14 Jan 2022 13:42:12 GMT Message-Id: <202201141342.20EDgCGL034440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 7f08e54f520f - stable/13 - loader: Do not force comconsole for arm and arm64 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7f08e54f520f51677cef31b1c4d0a815900eafad Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642167736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A70dFB2aClGceqxB7RQZWuJWtmeJs6VHK7MKM4v9pDw=; b=ZIi7tyXD632UwHhp6bLvfMKyw2FMWTsEkZNTNcWtJCObZgzhkpjEyULuJPA6sAzuplusjw aWyRl13J3fWcITBeTuwFs0n7DTY1TrNwDY7HOJNH/XusnyYJrd3o05g4B2xWP8xfgRzyxH eeVzzAWgM0RC7VV1Y6RuaV5Nmnpx1uSSVbIqiGk0YYZHF+WwKhsiCyd1dqsgCeV6pUMKWm +4F/5bSsoLo2I5xQ7KgQjdQ/Mk1k1Rhf9iiXZmMJov/WOq/EIufvTOmMkxMLP21zCvm/An qz78mb5D5wGKyPAVRxOWGNxaqEZLo87mFVI/u2Jazuwu5WUiJ7pG9PxkdIA3Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642167736; a=rsa-sha256; cv=none; b=Cbrz8UYQ+sukuq7Zdh/anjq895V+4VSUNyq3ufj5XaOk2TgKBj5fgFJEw81QPHtzo0XVNJ /rO+6WsYkbGERFq67cJxSHlEWBssma//RjguaKDeAnnkPqsfD5emzZHNh/LIEIw5fYS33L rhfbeg9qcKsRC21sgvKE1YVm0UZK4uZwhTI6vLIrnTFUoO4lrRTC4wUL4i5qO6tdNEe5h9 EWem/lFFlAQtrTneZL3eGht/1y/PvtJebi6OuGBe5g3GhY0pCESKNFjoIKS5IcrtBzqnM9 7afTVg8losmHtqR/PHNhlG0JlkvdJKv5rJhCYP+UrZT/GZSCGjNvU4vq9I0eAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=7f08e54f520f51677cef31b1c4d0a815900eafad commit 7f08e54f520f51677cef31b1c4d0a815900eafad Author: Emmanuel Vadot AuthorDate: 2021-11-15 11:17:43 +0000 Commit: Emmanuel Vadot CommitDate: 2022-01-14 13:38:34 +0000 loader: Do not force comconsole for arm and arm64 This makes GOP not probed on some situation (AMD Card on PCIe slot with EDK2 as we have a SERIAL_IO_PROTOCOL compatible uart). Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D32992 Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 123b5b8763778e83b6816ad9db62a9b956055c32) --- stand/efi/loader/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index a1a62381e45c..ee55366e0c44 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -923,7 +923,7 @@ main(int argc, CHAR16 *argv[]) */ setenv("console", "efi", 1); uhowto = parse_uefi_con_out(); -#if defined(__aarch64__) || defined(__arm__) || defined(__riscv) +#if defined(__riscv) if ((uhowto & RB_SERIAL) != 0) setenv("console", "comconsole", 1); #endif