git: 7f08e54f520f - stable/13 - loader: Do not force comconsole for arm and arm64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 14 Jan 2022 13:42:12 UTC
The branch stable/13 has been updated by manu:
URL: https://cgit.FreeBSD.org/src/commit/?id=7f08e54f520f51677cef31b1c4d0a815900eafad
commit 7f08e54f520f51677cef31b1c4d0a815900eafad
Author: Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-11-15 11:17:43 +0000
Commit: Emmanuel Vadot <manu@FreeBSD.org>
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