Author: imp Date: Sat Apr 13 06:30:45 2019 New Revision: 346177 URL: https://svnweb.freebsd.org/changeset/base/346177
Log: Move mpr/mps drivers from per-arch NOTES files into the MI notes file. They are in more arches they they aren't. Add appropriate nodevice directives in powerpc and arm. Modified: head/sys/amd64/conf/NOTES head/sys/arm/conf/NOTES head/sys/conf/NOTES head/sys/i386/conf/NOTES head/sys/powerpc/conf/NOTES head/sys/sparc64/conf/NOTES Modified: head/sys/amd64/conf/NOTES ============================================================================== --- head/sys/amd64/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/amd64/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -459,11 +459,6 @@ device imcsmb device isci options ISCI_LOGGING # enable debugging in isci HAL -# LSI-Logic MPT-Fusion drivers -device mpt # LSI-Logic MPT-Fusion -device mps # LSI-Logic MPT-Fusion 2 -device mpr # LSI-Logic MPT-Fusion 3 - # # NVM Express (NVMe) support device nvme # base NVMe driver Modified: head/sys/arm/conf/NOTES ============================================================================== --- head/sys/arm/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/arm/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -79,3 +79,7 @@ options KDTRACE_HOOKS # Alternatively include all the DTrace modules #device dtraceall + +# These aren't known to work on arm and/or don't compile +nodevice mpr +nodevice mps Modified: head/sys/conf/NOTES ============================================================================== --- head/sys/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -1565,6 +1565,8 @@ options TERMINAL_KERN_ATTR=(FG_LIGHTRED|BG_BLACK) # Qlogic ISP 2300 and ISP 2312 2Gb Fibre Channel host adapters. # Qlogic ISP 2322 and ISP 6322 2Gb Fibre Channel host adapters. # ispfw: Firmware module for Qlogic host adapters +# mpr: LSI-Logic MPT/Fusion Gen 3 +# mps: LSI-Logic MPT/Fusion Gen 2 # mpt: LSI-Logic MPT/Fusion 53c1020 or 53c1030 Ultra4 # or FC9x9 Fibre Channel host adapters. # sym: Symbios/Logic 53C8XX family of PCI-SCSI I/O processors: @@ -1594,7 +1596,9 @@ hint.isp.0.topology="nport-only" hint.isp.0.portwnn="w50000000aaaa0000" hint.isp.0.nodewnn="w50000000aaaa0001" device ispfw -device mpt +device mpr # LSI-Logic MPT-Fusion 3 +device mps # LSI-Logic MPT-Fusion 2 +device mpt # LSI-Logic MPT-Fusion device sym device trm Modified: head/sys/i386/conf/NOTES ============================================================================== --- head/sys/i386/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/i386/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -690,11 +690,6 @@ device ips device isci options ISCI_LOGGING # enable debugging in isci HAL -# LSI-Logic MPT-Fusion drivers -device mpt # LSI-Logic MPT-Fusion -device mps # LSI-Logic MPT-Fusion 2 -device mpr # LSI-Logic MPT-Fusion 3 - # # NVM Express (NVMe) support device nvme # base NVMe driver Modified: head/sys/powerpc/conf/NOTES ============================================================================== --- head/sys/powerpc/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/powerpc/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -80,6 +80,8 @@ nodevice ccr nodevice cxgbe # XXX: builds on powerpc64 only. nodevice cxgbev nodevice fdc +nodevice mpr # no 64-bit atomics +nodevice mps # no 64-bit atomics nodevice ppc nodevice splash # when splash works enable *_saver Modified: head/sys/sparc64/conf/NOTES ============================================================================== --- head/sys/sparc64/conf/NOTES Sat Apr 13 04:46:35 2019 (r346176) +++ head/sys/sparc64/conf/NOTES Sat Apr 13 06:30:45 2019 (r346177) @@ -85,11 +85,6 @@ options SUNKBD_EMULATE_ATKBD # allows to use the AT k options SUNKBD_DFLT_KEYMAP # specify the built-in keymap makeoptions SUNKBD_DFLT_KEYMAP=fr.dvorak -# LSI-Logic MPT-Fusion drivers -device mpt # LSI-Logic MPT-Fusion -device mps # LSI-Logic MPT-Fusion 2 -device mpr # LSI-Logic MPT-Fusion 3 - ##################################################################### # Devices we don't want to deal with _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
