From nobody Tue Oct 15 11:14:04 2024 X-Original-To: dev-commits-src-all@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 4XSWgx22kfz5Ymt5; Tue, 15 Oct 2024 11:14:05 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XSWgx09gBz4ZJj; Tue, 15 Oct 2024 11:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728990845; 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=zVEe79QSKb2MpnUhqyE8mhAwmeqk3TtfsNrKttdwESI=; b=qEEXj7MlpS4E8b+HBl0IPRAqJ/tGMQPVfK/Tu8diFcXrINU2SvkQBA5ca5cvF090oMlXRD L35WgPPLSCEkTaeS+sGqUjF0Deot49Z9o0viuzg6F5YgyoyTuQFeOcHGHVrzwgrW4RaUqU suj80XO9Rx+4KM38iMpenuW0woa6vv91Oyb62QqLp2ZPuGU45CD6JLPNt6k0wVFpuDD71Z 6quYdrOWiaMSx3j2JrIV7k8rJyimZxX+0Q/LUWklmf6NaycUrm6jKSc3Lc1e2O6FRlcMM3 dj8O5T7ROZp/eAb1v60YztLIdrGfyLpEQbOz9x+aR0TXs7/3Qo3ReqbmH5MziQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728990845; 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=zVEe79QSKb2MpnUhqyE8mhAwmeqk3TtfsNrKttdwESI=; b=IG+dFr20gcMyXJJUACXLngprj1HIfZ6kv8K7mVancqykpANX/DBm616wMc1CNLCpbVschc SLVqsbVFCYYe9YoY3tGZyAObpSsWvC6tIi0IKbdKcZ+NCQu0RoJ2MKKaRYfDae5YzZ5w+8 qA4YBkukrQUF6Ia34veoPh+RFK+MSmT9n5mDfa79hOQ+adJV6pFi+T1k6beGLr8kr6JUnE mFZAcrVZIM907Hs3dH+W/NXwOuFWdxPCWFPGy/+PHsH0jcISqcHJAv8QU2sDMu0YmdUW1l LaFdGiYXNEy55K6O0Nkoedfrgaq+5gGmrRAcS7I7BYGaMBaP13xYU6gOtom+Zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728990845; a=rsa-sha256; cv=none; b=EUuU8OkrwHWME9F6X3tntHCXYlLBgi3AYevfEgb9agi63lJrPbiL8n6EFvcB9j2BffgLVu b623rukNfnOPFmVNhYcb9rPx0uOeuFgh0p3ddzz0K0ZiRVDZN2qzTcwJzWqnFRdv4cG9Ss KjUYqzCqcEl/08yQ0qsLW7OGENPNotG180tDIaUMJbu39FdUHo5Yp4Zpy/eGyTAO1e195k 4kSTVpNoOBbeC8u+P27GKwdIFQH80gxtle2L9tMNKGDK6yDIJhLoVm+yNMY19KTEFY8LP1 /QFotGyY1Mzyy80mMGABr8UUDOpS1q+7msO0fUyArpSmz3qtpF3MZHc/T/lGdg== 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 4XSWgw6tv3zKWP; Tue, 15 Oct 2024 11:14:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49FBE4FS098033; Tue, 15 Oct 2024 11:14:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49FBE478098030; Tue, 15 Oct 2024 11:14:04 GMT (envelope-from git) Date: Tue, 15 Oct 2024 11:14:04 GMT Message-Id: <202410151114.49FBE478098030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 94164106c0a7 - main - loader.efi: |= the boot flags how List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94164106c0a7e18b5ac7a1508fed179b6e6939f9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=94164106c0a7e18b5ac7a1508fed179b6e6939f9 commit 94164106c0a7e18b5ac7a1508fed179b6e6939f9 Author: Warner Losh AuthorDate: 2024-10-15 11:11:02 +0000 Commit: Warner Losh CommitDate: 2024-10-15 11:11:02 +0000 loader.efi: |= the boot flags how how is assumed to be 0, so we directly assign to it. It might not always be 0, so or-in these bits. Sponsored by: Netflix Reviewed by: bz, andrew Differential Revision: https://reviews.freebsd.org/D47084 --- stand/efi/loader/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 400d46965c61..13ef90795d4b 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -767,9 +767,9 @@ parse_uefi_con_out(void) * all the other more common cases). */ if (efi_has_gop()) - how = RB_MULTIPLE; + how |= RB_MULTIPLE; else - how = RB_MULTIPLE | RB_SERIAL; + how |= RB_MULTIPLE | RB_SERIAL; setenv("console", "efi,comconsole", 1); goto out; }