The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=123b5b8763778e83b6816ad9db62a9b956055c32
commit 123b5b8763778e83b6816ad9db62a9b956055c32 Author: Emmanuel Vadot <[email protected]> AuthorDate: 2021-11-15 11:17:43 +0000 Commit: Emmanuel Vadot <[email protected]> CommitDate: 2021-11-16 09:11:56 +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 --- 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 73936d870771..7b78f94eb368 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -947,7 +947,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
