git: 269cbe092da3 - main - kern.opts.mk: Remove EFI from riscv BROKEN_OPTIONS
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 28 Mar 2025 17:57:40 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=269cbe092da38e1100df5008b664db89510c3604
commit 269cbe092da38e1100df5008b664db89510c3604
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-03-28 13:28:24 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2025-03-28 17:56:55 +0000
kern.opts.mk: Remove EFI from riscv BROKEN_OPTIONS
This discrepancy previously caused `make makeman` to warn
`riscv/riscv64: ignoring duplicate option EFI`. Make the kernel EFI
option consistent with EFI's per-arch defaults in src.opts.mk to remove
the warning. Note that we do build EFI boot programs for RISC-V.
This is a NFC because the only component gated by the kernel's EFI
option is sys/modules/efirt, which is also inside of a MACHINE_CPUARCH
block that excludes riscv64 anyway.
Reviewed by: mhorne
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D49549
---
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 d9d96a133250..045e55d1b19a 100644
--- a/sys/conf/kern.opts.mk
+++ b/sys/conf/kern.opts.mk
@@ -79,8 +79,8 @@ BROKEN_OPTIONS+= OFED
BROKEN_OPTIONS+= KERNEL_RETPOLINE
.endif
-# EFI doesn't exist on powerpc or riscv and is broken on i386
-.if ${MACHINE:Mpowerpc} || ${MACHINE:Mriscv} || ${MACHINE} == "i386"
+# EFI doesn't exist on powerpc and is broken on i386
+.if ${MACHINE:Mpowerpc} || ${MACHINE} == "i386"
BROKEN_OPTIONS+=EFI
.endif