The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=f9bf88760dbf1b46757d8e8ac13cccbe6e6a6c81
commit f9bf88760dbf1b46757d8e8ac13cccbe6e6a6c81
Author: Warner Losh <i...@freebsd.org>
AuthorDate: 2021-12-31 22:02:35 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2021-12-31 22:09:46 +0000
mips: Remove system module support
Remove all mips .if conditionals. Since _sym was now set
unconditionally, just add it to the right place w/o a variable.
Sponsored by: Netflix
---
sys/modules/Makefile | 20 ++++----------------
1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 188ddd8d7e8b..65d7ea7fefa2 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -356,7 +356,7 @@ SUBDIR= \
${_sume} \
${_superio} \
${_p2sb} \
- ${_sym} \
+ sym \
${_syscons} \
sysvipc \
tcp \
@@ -406,8 +406,7 @@ _autofs= autofs
.endif
.if ${MK_CDDL} != "no" || defined(ALL_MODULES)
-.if (${MACHINE_CPUARCH} != "arm" || ${MACHINE_ARCH:Marmv[67]*} != "") && \
- ${MACHINE_CPUARCH} != "mips"
+.if ${MACHINE_CPUARCH} != "arm" || ${MACHINE_ARCH:Marmv[67]*} != ""
.if ${KERN_OPTS:MKDTRACE_HOOKS}
SUBDIR+= dtrace
.endif
@@ -551,17 +550,13 @@ _bce= bce
_fxp= fxp
_ispfw= ispfw
_ti= ti
-
-.if ${MACHINE_CPUARCH} != "mips"
_mwlfw= mwlfw
_otusfw= otusfw
_ralfw= ralfw
_rtwnfw= rtwnfw
.endif
-.endif
.if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} != "arm" && \
- ${MACHINE_CPUARCH} != "mips" && \
${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" && \
${MACHINE_CPUARCH} != "riscv"
_cxgbe= cxgbe
@@ -575,8 +570,7 @@ _ice_ddp= ice_ddp
.endif
# These rely on 64bit atomics
-.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" && \
- ${MACHINE_CPUARCH} != "mips"
+.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe"
_mps= mps
_mpr= mpr
.endif
@@ -590,20 +584,14 @@ SUBDIR+= zfs
.endif
.if ${MACHINE_CPUARCH} != "aarch64" && ${MACHINE_CPUARCH} != "arm" && \
- ${MACHINE_CPUARCH} != "mips" && ${MACHINE_CPUARCH} != "powerpc" && \
- ${MACHINE_CPUARCH} != "riscv"
+ ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_CPUARCH} != "riscv"
_syscons= syscons
.endif
-.if ${MACHINE_CPUARCH} != "mips"
-# no BUS_SPACE_UNSPECIFIED
-# No barrier instruction support (specific to this driver)
-_sym= sym
# intr_disable() is a macro, causes problems
.if ${MK_SOURCELESS_UCODE} != "no"
_cxgb= cxgb
.endif
-.endif
.if ${MACHINE_CPUARCH} == "aarch64"
_allwinner= allwinner
