From nobody Fri Mar 28 17:57:40 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZPSsw4P70z5rBpx; Fri, 28 Mar 2025 17:57:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZPSsw3cDfz3NPW; Fri, 28 Mar 2025 17:57:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743184660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v+QdkXab4ot/8F7Qi9bPYC/hPiKhBeSFNk/KZzJ9IzI=; b=M2Y7FsnKofjhenv7UCbXj8ecSz0awKkIPTa6koX/IMIBlfvT0wYYrxp5xKDt5QEW4AjSKF AxaNs6Jiw6lUe2bdMip3LBWkz6vIw8X3ayIZ5XF9Hh3ri+vPvfDxCZ46Jpgx/s6knNPlil rpdT7aE50L/aZ6GPxccJk6SvDv2y8uSqvEYWRihnC2vMns8q9+7iFGqRmdAC+uiXXw7rmd 3uXTDF5OwGFba07LhiJmCjgjtltp1BdyYm4VjxpqjY8DeB0T3k2Cs3WsQcZuWeioeQPexU Ko2i9lKN0mZ70T4UOkZf+x/n4My5l+sHEtpuDTH35j3XHgpm+AtfKuGOfx0gWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743184660; a=rsa-sha256; cv=none; b=SQsUh/gb944/XDOifgqQfbWlXHYDWRCZZOAjk2Q3pMb5pZp8pCEm8Qk632NTb72w+UB40B GEo/tYM5Dq8r+JMapwLSQK59EUbG0uC1CJmOYbUKxZpt9l8hpnAyWteee6UAH0lckC8Voj Sp949hg3e17l9+pnTWqMsJzQb9CHTLwEbvjiy/+qs0tLUWtu70BqXH98ckkSPgSmZdC9dg wGJz7R05JdsQn1/M+SZbQx44HpZXzAFiAonGANLuGn07+2dvDQ5B9viPfzBhiGPF3+Y8Io cYc0IVB0NrKQ1gbCUidWZdu266Z7740C45K9mgC1wicOP7WZWPipi/wHnvQGLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743184660; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=v+QdkXab4ot/8F7Qi9bPYC/hPiKhBeSFNk/KZzJ9IzI=; b=oKYidgeuJ2HhCIavX8rLpRZIPe47zASwU50Ch81i6Y/2SFFYgP9oOYYJ69rNYMCs8GpOEQ rETcGWWxwQW31sV0QYmxHrmBMdxmqSZHsCQBsJbFdiIoMbHeu9NLC5myurgIAR08zyGJ/m 3Nr/gBXaaFa/9SWENNPl7RjoT/4uVN4Q3bFMR5U4CY6GdaSw9xPR1ooQzn02U3sQrZ6Q2i HBBPcSP/MUL7jtwBA+Kq/lh8DrCoDVsxcQS8fepJJKGQ6QT68Qk3lMp4n6nw+NSx5b2hl3 PlNdHjIkWYqKzBokwxgdRJy5Mpu0ZHu+OeYA3pAYG8u3mFeKUelCp9Jk5vZMXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZPSsw3BkwztBC; Fri, 28 Mar 2025 17:57:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52SHvejY091114; Fri, 28 Mar 2025 17:57:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52SHvef2091111; Fri, 28 Mar 2025 17:57:40 GMT (envelope-from git) Date: Fri, 28 Mar 2025 17:57:40 GMT Message-Id: <202503281757.52SHvef2091111@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 269cbe092da3 - main - kern.opts.mk: Remove EFI from riscv BROKEN_OPTIONS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 269cbe092da38e1100df5008b664db89510c3604 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=269cbe092da38e1100df5008b664db89510c3604 commit 269cbe092da38e1100df5008b664db89510c3604 Author: Ed Maste AuthorDate: 2025-03-28 13:28:24 +0000 Commit: Ed Maste 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