From nobody Mon Oct 20 23:42:19 2025 X-Original-To: dev-commits-src-main@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 4crBmX5S2Hz6DLYX; Mon, 20 Oct 2025 23:42:20 +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 4crBmW6XTsz3qPr; Mon, 20 Oct 2025 23:42:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003739; 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=4EgNUUyUwCX96azvNk4a6HYXxR8q6v531MCtWGmStW0=; b=W6Cy3gg9rMqTpGA+b4456lToGUPfExGGXTxf0CoPvQbIjMiUnz/VDo7IMAFyDH/nE3tNMZ djmkueC1qZ8padskmw9hX+H8ceY3EuD2d4K9ePpIot/pFchbiCiBPnzDj9TgZvh7wRCjYA EYYUoJHFSVoDZBgCZE4Wvr7q+G3KxEetiTkUdgAS6ch4y7pic46zt8WnaSL7G2lzQJ4ZSy qkySxCWq7p2vwiV8/KwC7SUcvqAl6y0K5r13qv+mzPfkS3IX0tpz2B4v4IE9ARjaGOrkRp ca6meu7HbcL5lVzThQePefikerY1bNsx8lutg28ah9jWnbI2anpZkNfL0gBiNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1761003739; 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=4EgNUUyUwCX96azvNk4a6HYXxR8q6v531MCtWGmStW0=; b=D5gy5sI3IJimJ5W2XzF00mgx5eMga2diE3kw+/gj4n8QTo9xjm4IGXvQ5N+O8syFgbfXXN K+1g6Ce4Zig0aAJ4wyr20TodGdfne/mxDkEYWHiM8CsTo70CTdGxiCyiHrQfE6bNmBymMg 4BVvU1I48yp8ZfyeQP8d/Xxleow2salkrj45uh9Atm5JLEn99TSMZ89VC9RX449nsdSOi4 GqYL85CaTffpKjEb21HCut3+299uMV1+/bw18l5VSOl6Tl0vHEkzxUr/HPsbI6ezVGh35A Bl32USPxr4/gt2ilVn+T3dPqfsH/p32KvvkqAlOoowp+yMxdAMMbhfW+4aMM+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1761003739; a=rsa-sha256; cv=none; b=J9XDUg2yVBg3G3VICqx1DKfNh5qtPlTw6a6QkPtA1mc50J/2dY6ff0wqbnfjP7qXQs/itj VQi2/I7jklz/SbdUYURF3eh9b6d/3B0OVH6ghifl3wDk5htUleXaXGuA+pfC9JeMX1kYF6 4ZTWmWp1lQtBWxWSYB5EsuZRkpMPaDlPBRbK0TlsngUtHO4jXVZnc9MEjju1mkDUFT1gld 1/Z19W7Q3iQe/nnE92bispiWpjUbL2zqxCaCnmgIZPdZOhrwk+56+OCzCEs0E9AwkXrv/H qpXTPmDjwpXzvOm9MeIYZDWTcmV9uXKYw6TSLJSQKzaSdr2ZJ3LG09e05c/+tg== 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 4crBmW608Fzb47; Mon, 20 Oct 2025 23:42:19 +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 59KNgJEO091788; Mon, 20 Oct 2025 23:42:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59KNgJof091785; Mon, 20 Oct 2025 23:42:19 GMT (envelope-from git) Date: Mon, 20 Oct 2025 23:42:19 GMT Message-Id: <202510202342.59KNgJof091785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: ddc1d4b0722b - main - modules: fix some riscv module logic List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ddc1d4b0722bd63934f503c43a5ee35d871355ee Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=ddc1d4b0722bd63934f503c43a5ee35d871355ee commit ddc1d4b0722bd63934f503c43a5ee35d871355ee Author: Mitchell Horne AuthorDate: 2025-10-20 23:11:53 +0000 Commit: Mitchell Horne CommitDate: 2025-10-20 23:37:13 +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") --- sys/modules/Makefile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 02ed6a0480e6..3086be864307 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -683,6 +683,7 @@ _irdma= irdma .if !empty(OPT_FDT) _allwinner= allwinner _if_cgem= if_cgem +_sdhci_fdt= sdhci_fdt .endif .endif @@ -726,14 +727,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) @@ -928,7 +921,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 ${MACHINE_CPUARCH} == "amd64"