Date: Sun, 9 Dec 2018 06:06:07 +0000 (UTC) From: Scott Long <scottl@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r341754 - in head/sys: modules powerpc/conf Message-ID: <201812090606.wB9667Kf045391@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: scottl Date: Sun Dec 9 06:06:06 2018 New Revision: 341754 URL: https://svnweb.freebsd.org/changeset/base/341754 Log: Remove the mps driver from powerpc 32bit GENERIC, and don't build it and mpr as a module for powerpc or mips. An upcoming commit will cause these drivers to rely on the presence of 64bit atomic operations. Discussed with jhibbits. Modified: head/sys/modules/Makefile head/sys/powerpc/conf/GENERIC Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Sun Dec 9 05:35:22 2018 (r341753) +++ head/sys/modules/Makefile Sun Dec 9 06:06:06 2018 (r341754) @@ -250,8 +250,8 @@ SUBDIR= \ ${_mly} \ mmc \ mmcsd \ - mpr \ - mps \ + ${_mpr} \ + ${_mps} \ mpt \ mqueue \ mrsas \ @@ -521,6 +521,12 @@ _rtwnfw= rtwnfw ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" && \ ${MACHINE_CPUARCH} != "riscv" _cxgbe= cxgbe +.endif + +# These rely on 64bit atomics +.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_CPUARCH} != "mips" +_mps= mps +_mpr= mpr .endif .if ${MK_TESTS} != "no" || defined(ALL_MODULES) Modified: head/sys/powerpc/conf/GENERIC ============================================================================== --- head/sys/powerpc/conf/GENERIC Sun Dec 9 05:35:22 2018 (r341753) +++ head/sys/powerpc/conf/GENERIC Sun Dec 9 06:06:06 2018 (r341754) @@ -129,7 +129,6 @@ options AHC_ALLOW_MEMIO # Attempt to use memory mappe device isp # Qlogic family device ispfw # Firmware module for Qlogic host adapters device mpt # LSI-Logic MPT-Fusion -device mps # LSI-Logic MPT-Fusion 2 device sym # NCR/Symbios/LSI Logic 53C8XX/53C1010/53C1510D # ATA/SCSI peripherals
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812090606.wB9667Kf045391>