Date: Thu, 23 Oct 2025 18:37:34 GMT From: Mitchell Horne <mhorne@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: cd7c8ba03b26 - stable/15 - modules: fix some riscv module logic Message-ID: <202510231837.59NIbYYs059697@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/15 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=cd7c8ba03b26d94769341f9b0e933c1d7f7e53df commit cd7c8ba03b26d94769341f9b0e933c1d7f7e53df Author: Mitchell Horne <mhorne@FreeBSD.org> AuthorDate: 2025-10-20 23:11:53 +0000 Commit: Mitchell Horne <mhorne@FreeBSD.org> 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)home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510231837.59NIbYYs059697>