git: 74674fef3c12 - main - kern.opts.mk: rationalize i386 EFI default with src.opts.mk
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 12 May 2023 16:15:10 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=74674fef3c123d2bcb054f8723ed1bd781972c79
commit 74674fef3c123d2bcb054f8723ed1bd781972c79
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-05-12 14:39:42 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-05-12 15:04:00 +0000
kern.opts.mk: rationalize i386 EFI default with src.opts.mk
PR: 269994
Fixes: ad9d10a859a ("efi: mark as broken on i386")
Sponsored by: The FreeBSD Foundation
---
sys/conf/kern.opts.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk
index 53992a31d07c..e61cf9686a76 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -89,8 +89,8 @@ BROKEN_OPTIONS+= OFED
BROKEN_OPTIONS+= KERNEL_RETPOLINE
.endif
-# EFI doesn't exist on powerpc, or riscv
-.if ${MACHINE:Mpowerpc} || ${MACHINE:Mriscv}
+# EFI doesn't exist on powerpc or riscv and is broken on i386
+.if ${MACHINE:Mpowerpc} || ${MACHINE:Mriscv} || ${MACHINE} == "i386"
BROKEN_OPTIONS+=EFI
.endif