From 7f08e54f520f51677cef31b1c4d0a815900eafad Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Mon, 15 Nov 2021 12:17:43 +0100 Subject: [PATCH] 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