Date: Tue, 15 Oct 2024 11:14:04 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 94164106c0a7 - main - loader.efi: |= the boot flags how Message-ID: <202410151114.49FBE478098030@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=94164106c0a7e18b5ac7a1508fed179b6e6939f9 commit 94164106c0a7e18b5ac7a1508fed179b6e6939f9 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2024-10-15 11:11:02 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410151114.49FBE478098030>