From nobody Thu Oct 23 18:37:34 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 4csvsW2Nk0z6DC8m; Thu, 23 Oct 2025 18:37:35 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4csvsW02qdz42Cl; Thu, 23 Oct 2025 18:37:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761244655; 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=E4sehaOb0Ey+HSrZ/ieIU+S8LYX0eXzOFVWbEJUvKpg=; b=OC2hMRJT78mvzMtW1sE0/kvkf5cwPwCyfaEYMEmsX5Oy34ey9PITsKgg9fJruX1LVRfUww xmuo0wQSiwfN0wD+H1IADoSi7COZ6m5JoTN/8wNf6vX1b458v+2+mxAa/cZIP66ypEj68l spF13H58TFr7Tvr9CtX0tPwnZTZUjdkEvWC3DuxZDSTEe5S1Gva9gi5vZOPFZWkkLgDAjz AcmYc9hidIDKc4425NuWsWYwavVMJHCAlPtDgJq0QMM2wkfFxRE8iOqIKjNtFfrGlbMPmA XXtoxQniYT5ppZ1US68GsWguZeFCRoXUdNZsM4bz+3S0xT3R92rOZW1314E3lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761244655; 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=E4sehaOb0Ey+HSrZ/ieIU+S8LYX0eXzOFVWbEJUvKpg=; b=H8KLxCc9jeCjiPjwwo1qxaa59WyUuld4L+th0x9K8Dsuh7T12sxv8vRFopdy/R6XMZNqsy qBiXX3+8Vqr0VahKb4UCrW7LSD4K7aec/d/nJ1fgI+OrRY45wj7Uear3l5/o6tmtz5zaOr GHXud4gZS3h5O7pqVf1UShubDZWiZ3xRmpRIaKawAuXYuZmklCVazmjEhaHo5l5TD4njbS 3UzmOYd8YHkvza6ad/wZ2sZkbCmK+/aZ55wKw8sPB9ZDXKCoTQO6UbksjPHLEsv9ngPS2X rydegrM1utqR1qFfWkXsUDtmT6qCb1k1umjQXWiDsxXL/YlfIVheB2iiNmVAlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761244655; a=rsa-sha256; cv=none; b=n2JTHw4IgCMLqpb48x89KBIJbPVdYOEhGItA0OM4TAzkOAVwWJR1CHC+4IMGvzwQ57jowm nQT+RyB2L8ASdn3iExuW5Be/oMUWxabXbkDu18tZkNy900O380abGcmBF8l3kG5beuCDfY scWargIWmmUKuRwL0Soz9Tz5++crMraE6wbFgUTIkh5f75vVxUloH0RrVTQfcLpvRqfYgS d8JBO3pqtNQWZ77NPeY+hYrIgSuUWnWw/taDmj7feyOkau77opkXwHyThrWFm9cbgnvKMy kbxbNt/RDEg2XluYcOrsPs/ks/Nl1pEbvO6cSslFwtRX3NBgOQaH3PTS1Auk+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4csvsV6hdLzBHX; Thu, 23 Oct 2025 18:37:34 +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 59NIbYB9059700; Thu, 23 Oct 2025 18:37:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59NIbYYs059697; Thu, 23 Oct 2025 18:37:34 GMT (envelope-from git) Date: Thu, 23 Oct 2025 18:37:34 GMT Message-Id: <202510231837.59NIbYYs059697@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: cd7c8ba03b26 - stable/15 - modules: fix some riscv module logic 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: cd7c8ba03b26d94769341f9b0e933c1d7f7e53df Auto-Submitted: auto-generated The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=cd7c8ba03b26d94769341f9b0e933c1d7f7e53df commit cd7c8ba03b26d94769341f9b0e933c1d7f7e53df Author: Mitchell Horne AuthorDate: 2025-10-20 23:11:53 +0000 Commit: Mitchell Horne CommitDate: 2025-10-23 18:31:32 +0000 modules: fix some riscv module logic The change which enabled the sdhci_fdt module build on riscv inadvertently enabled the neta module as well. This driver is not needed on this platform. Move each entry to a respective identical conditional blocks. MFC after: 3 days Sponsored by: The FreeBSD Foundation Fixes: e9dd9f95f82f ("riscv: Add the sdhci_fdt driver to the build") (cherry picked from commit ddc1d4b0722bd63934f503c43a5ee35d871355ee) --- sys/modules/Makefile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index cd91603d1421..efe1e7ba3ab6 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -679,6 +679,7 @@ _irdma= irdma .if !empty(OPT_FDT) _allwinner= allwinner _if_cgem= if_cgem +_sdhci_fdt= sdhci_fdt .endif .endif @@ -722,14 +723,6 @@ _rockchip= rockchip _imx= imx .endif -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \ - ${MACHINE_CPUARCH} == "riscv" -.if !empty(OPT_FDT) -_sdhci_fdt= sdhci_fdt -.endif -_neta= neta -.endif - .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _agp= agp .if ${MACHINE_CPUARCH} == "i386" || !empty(COMPAT_FREEBSD32_ENABLED) @@ -924,7 +917,8 @@ _nvram+= powermac_nvram .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" _bcm283x_clkman= bcm283x_clkman -_bcm283x_pwm= bcm283x_pwm +_bcm283x_pwm= bcm283x_pwm +_neta= neta .endif .if !(${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 110000)