From 49da75c9f611f301f21b32967b476abbbb4f4b8b Mon Sep 17 00:00:00 2001 From: Jens Schweikhardt Date: Wed, 18 Jan 2012 08:56:26 +0000 Subject: Connect the bktr module(s) to the amd64 build. MFC after: 7 days --- sys/modules/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'sys/modules/Makefile') diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 3a3f5e2358e2..f245cc25162f 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -564,6 +564,7 @@ _amdsbwd= amdsbwd _amdtemp= amdtemp _arcmsr= arcmsr _asmc= asmc +_bktr= bktr _bxe= bxe _cardbus= cardbus _cbb= cbb -- cgit v1.2.3 From aa57e971bc608ca716f69efe16644ae6e952546e Mon Sep 17 00:00:00 2001 From: "Bjoern A. Zeeb" Date: Sun, 22 Jan 2012 02:16:31 +0000 Subject: Fix ip_divert handling of inet and inet6 and module building some more. Properly sort the "carp" case in modules/Makefile after it was renamed. Reported by: bde (most) Reviewed by: bde MFC after: 3 days --- sys/modules/Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'sys/modules/Makefile') diff --git a/sys/modules/Makefile b/sys/modules/Makefile index f245cc25162f..24b5391f08f6 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -136,7 +136,7 @@ SUBDIR= ${_3dfx} \ ${_igb} \ ${_iir} \ ${_io} \ - ipdivert \ + ${_ipdivert} \ ${_ipfilter} \ ${_ipfw} \ ipfw_nat \ @@ -370,20 +370,21 @@ _random= random .endif .endif -.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES) -_if_gre= if_gre -.endif - .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \ defined(ALL_MODULES) _carp= carp .endif +.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES) +_if_gre= if_gre +.endif + .if ${MK_IPFILTER} != "no" || defined(ALL_MODULES) _ipfilter= ipfilter .endif .if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES) +_ipdivert= ipdivert _ipfw= ipfw .endif -- cgit v1.2.3 From f11c7f63056671247335df83a3fe80b94c6616ac Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 31 Jan 2012 19:38:18 +0000 Subject: Add isci(4) driver for amd64 and i386 targets. The isci driver is for the integrated SAS controller in the Intel C600 (Patsburg) chipset. Source files in sys/dev/isci directory are FreeBSD-specific, and sys/dev/isci/scil subdirectory contains an OS-agnostic library (SCIL) published by Intel to control the SAS controller. This library is used primarily as-is in this driver, with some post-processing to better integrate into the kernel build environment. isci.4 and a README in the sys/dev/isci directory contain a few additional details. This driver is only built for amd64 and i386 targets. Sponsored by: Intel Reviewed by: scottl Approved by: scottl --- sys/modules/Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sys/modules/Makefile') diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 24b5391f08f6..e16f8defd9e4 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -145,6 +145,7 @@ SUBDIR= ${_3dfx} \ ${_ips} \ ${_ipw} \ ${_ipwfw} \ + ${_isci} \ iscsi \ isp \ ispfw \ @@ -521,6 +522,7 @@ _ipmi= ipmi _ips= ips _ipw= ipw _ipwfw= ipwfw +_isci= isci _iwi= iwi _iwifw= iwifw _iwn= iwn @@ -602,6 +604,7 @@ _ipmi= ipmi _ips= ips _ipw= ipw _ipwfw= ipwfw +_isci= isci _iwi= iwi _iwifw= iwifw _iwn= iwn -- cgit v1.2.3 From 363e589a37a64b11c0250e885d4f4598993a2efa Mon Sep 17 00:00:00 2001 From: Justin Hibbits Date: Wed, 1 Feb 2012 03:42:14 +0000 Subject: Enable the pccard/cardbus modules for powerpc. Approved by: nwhitehorn (mentor) --- sys/modules/Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sys/modules/Makefile') diff --git a/sys/modules/Makefile b/sys/modules/Makefile index e16f8defd9e4..9ea9bb62bb0b 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -707,9 +707,12 @@ _xe= xe _agp= agp _an= an _bm= bm +_cardbus= cardbus +_cbb= cbb _cfi= cfi _cpufreq= cpufreq _nvram= powermac_nvram +_pccard= pccard _smbfs= smbfs _sound= sound .endif -- cgit v1.2.3 From 4a47892c81d0f1f20a7740d487cd4a0c6e3631e9 Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Sat, 4 Feb 2012 00:54:43 +0000 Subject: Add MK_SOURCELESS build option. Setting MK_SOURCELESS to "no" will disable kernel modules that include binary-only code. More fine-grained control is provided via MK_SOURCELESS_HOST (for native code that runs on host CPU) and MK_SOURCELESS_UCODE (for microcode). Reviewed by: julian, delphij, freebsd-arch Approved by: kib (mentor) MFC after: 2 weeks --- sys/modules/Makefile | 75 ++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 64 insertions(+), 11 deletions(-) (limited to 'sys/modules/Makefile') diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 9ea9bb62bb0b..ea84b544f8fc 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -2,6 +2,9 @@ .include +# Modules that include binary-only blobs of microcode should be selectable by +# MK_SOURCELESS_UCODE option (see below). + SUBDIR= ${_3dfx} \ ${_3dfx_linux} \ ${_aac} \ @@ -36,7 +39,7 @@ SUBDIR= ${_3dfx} \ ath \ ath_pci \ ${_auxio} \ - bce \ + ${_bce} \ bfe \ bge \ ${_bxe} \ @@ -95,13 +98,13 @@ SUBDIR= ${_3dfx} \ ${_ex} \ ${_exca} \ ${_ext2fs} \ - fatm \ + ${_fatm} \ fdc \ fdescfs \ ${_fe} \ firewire \ firmware \ - fxp \ + ${_fxp} \ gem \ geom \ ${_glxiic} \ @@ -148,7 +151,7 @@ SUBDIR= ${_3dfx} \ ${_isci} \ iscsi \ isp \ - ispfw \ + ${_ispfw} \ ${_iwi} \ ${_iwifw} \ ${_iwn} \ @@ -209,7 +212,7 @@ SUBDIR= ${_3dfx} \ ${_mthca} \ mvs \ mwl \ - mwlfw \ + ${_mwlfw} \ mxge \ my \ ${_ncp} \ @@ -259,14 +262,14 @@ SUBDIR= ${_3dfx} \ puc \ ${_qlxgb} \ ral \ - ralfw \ + ${_ralfw} \ ${_random} \ rc4 \ ${_rdma} \ re \ reiserfs \ rl \ - runfw \ + ${_runfw} \ ${_s3} \ ${_safe} \ ${_sbni} \ @@ -276,7 +279,7 @@ SUBDIR= ${_3dfx} \ sdhci \ sem \ send \ - sf \ + ${_sf} \ ${_sfxge} \ sge \ siba_bwn \ @@ -285,7 +288,7 @@ SUBDIR= ${_3dfx} \ sis \ sk \ ${_smbfs} \ - sn \ + ${_sn} \ ${_snc} \ snp \ ${_sound} \ @@ -300,7 +303,7 @@ SUBDIR= ${_3dfx} \ ${_sym} \ ${_syscons} \ sysvipc \ - ti \ + ${_ti} \ tl \ tmpfs \ ${_tpm} \ @@ -309,7 +312,7 @@ SUBDIR= ${_3dfx} \ twe \ tws \ tx \ - txp \ + ${_txp} \ uart \ ubsec \ udf \ @@ -358,8 +361,10 @@ _vpo= vpo # 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 ${MK_CRYPT} != "no" || defined(ALL_MODULES) .if exists(${.CURDIR}/../opencrypto) @@ -402,6 +407,20 @@ _pfsync= pfsync .endif .endif +.if ${MK_SOURCELESS_UCODE} != "no" +_bce= bce +_fatm= fatm +_fxp= fxp +_ispfw= ispfw +_mwlfw= mwlfw +_ralfw= ralfw +_runfw= runfw +_sf= sf +_sn= sn +_ti= ti +_txp= txp +.endif + .if ${MACHINE_CPUARCH} == "i386" # XXX some of these can move to the general case when de-i386'ed # XXX some of these can move now, but are untested on other architectures. @@ -417,9 +436,13 @@ _bktr= bktr _bxe= bxe _cardbus= cardbus _cbb= cbb +.if ${MK_SOURCELESS_UCODE} != "no" _ce= ce +.endif _coff= coff +.if ${MK_SOURCELESS_UCODE} != "no" _cp= cp +.endif _cpuctl= cpuctl _cpufreq= cpufreq _cs= cs @@ -508,36 +531,52 @@ _ciss= ciss _cm= cm _cmx= cmx _coretemp= coretemp +.if ${MK_SOURCELESS_UCODE} != "no" _ctau= ctau +.endif _dpt= dpt _ex= ex +.if ${MK_SOURCELESS_HOST} != "no" _hpt27xx= hpt27xx +.endif _hptiop= hptiop +.if ${MK_SOURCELESS_HOST} != "no" _hptmv= hptmv _hptrr= hptrr +.endif _ichwd= ichwd _ida= ida _iir= iir _ipmi= ipmi _ips= ips _ipw= ipw +.if ${MK_SOURCELESS_UCODE} != "no" _ipwfw= ipwfw +.endif _isci= isci _iwi= iwi +.if ${MK_SOURCELESS_UCODE} != "no" _iwifw= iwifw +.endif _iwn= iwn +.if ${MK_SOURCELESS_UCODE} != "no" _iwnfw= iwnfw +.endif _ixgb= ixgb _ixgbe= ixgbe _mly= mly _nfe= nfe +.if ${MK_SOURCELESS_HOST} != "no" _nve= nve +.endif _nvram= nvram _nxge= nxge _tpm= tpm _viawd= viawd _wpi= wpi +.if ${MK_SOURCELESS_UCODE} != "no" _wpifw= wpifw +.endif .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) _padlock= padlock .endif @@ -589,10 +628,14 @@ _et= et _em= em _exca= exca _ext2fs= ext2fs +.if ${MK_SOURCELESS_HOST} != "no" _hpt27xx= hpt27xx +.endif _hptiop= hptiop +.if ${MK_SOURCELESS_HOST} != "no" _hptmv= hptmv _hptrr= hptrr +.endif _i2c= i2c _ichwd= ichwd _ida= ida @@ -603,12 +646,18 @@ _io= io _ipmi= ipmi _ips= ips _ipw= ipw +.if ${MK_SOURCELESS_UCODE} != "no" _ipwfw= ipwfw +.endif _isci= isci _iwi= iwi +.if ${MK_SOURCELESS_UCODE} != "no" _iwifw= iwifw +.endif _iwn= iwn +.if ${MK_SOURCELESS_UCODE} != "no" _iwnfw= iwnfw +.endif _ixgb= ixgb _ixgbe= ixgbe _lindev= lindev @@ -624,7 +673,9 @@ _mthca= mthca .endif _ndis= ndis _nfe= nfe +.if ${MK_SOURCELESS_HOST} != "no" _nve= nve +.endif _nvram= nvram _nxge= nxge .if ${MK_CDDL} != "no" || defined(ALL_MODULES) @@ -654,7 +705,9 @@ _vxge= vxge _x86bios= x86bios _wi= wi _wpi= wpi +.if ${MK_SOURCELESS_UCODE} != "no" _wpifw= wpifw +.endif .if ${MK_ZFS} != "no" || defined(ALL_MODULES) _zfs= zfs .endif -- cgit v1.2.3 From fb6d9e6077f2f73b254860e8d1bbccc0d2855a87 Mon Sep 17 00:00:00 2001 From: Justin Hibbits Date: Sun, 5 Feb 2012 13:29:01 +0000 Subject: Add exca to powerpc modules build as a dependency for cbb. --- sys/modules/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'sys/modules/Makefile') diff --git a/sys/modules/Makefile b/sys/modules/Makefile index ea84b544f8fc..5dde58a9cfcc 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -764,6 +764,7 @@ _cardbus= cardbus _cbb= cbb _cfi= cfi _cpufreq= cpufreq +_exca= exca _nvram= powermac_nvram _pccard= pccard _smbfs= smbfs -- cgit v1.2.3 From 2f345d8ed55d5dd29023c1f0e6b6a396e1bf2770 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Fri, 10 Feb 2012 21:03:04 +0000 Subject: Add a driver for Emulex OneConnect ethernet cards (10 Gbit PCIe) A manpage will come in a future commit. Submitted by: Naresh Raju Gottumukkala (emulex) --- sys/modules/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'sys/modules/Makefile') diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 5dde58a9cfcc..0cf237fb88d5 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -240,6 +240,7 @@ SUBDIR= ${_3dfx} \ ${_nwfs} \ ${_nxge} \ ${_opensolaris} \ + oce \ ${_padlock} \ patm \ ${_pccard} \ -- cgit v1.2.3 From 0566170f7088552a46f794edab10b14f195e1454 Mon Sep 17 00:00:00 2001 From: "Bjoern A. Zeeb" Date: Tue, 6 Mar 2012 18:44:52 +0000 Subject: Provide wbwd(4), a driver for the watchdog timer found on various Winbond Super I/O chips. With minor efforts it should be possible the extend the driver to support further chips/revisions available from Winbond. In the simplest case only new IDs need to be added, while different chipsets might require their own function to enter extended function mode, etc. Sponsored by: Sandvine Incorporated ULC (in 2011) Reviewed by: emaste, brueffer MFC after: 2 weeks --- sys/modules/Makefile | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sys/modules/Makefile') diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 0cf237fb88d5..c2ddfe4fa707 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -333,6 +333,7 @@ SUBDIR= ${_3dfx} \ vx \ ${_vxge} \ wb \ + ${_wbwd} \ ${_wi} \ wlan \ wlan_acl \ @@ -510,6 +511,7 @@ _stg= stg _streams= streams _svr4= svr4 _vxge= vxge +_wbwd= wbwd _wi= wi _xe= xe .if ${MK_ZFS} != "no" || defined(ALL_MODULES) @@ -704,6 +706,7 @@ _viawd= viawd _virtio= virtio _vxge= vxge _x86bios= x86bios +_wbwd= wbwd _wi= wi _wpi= wpi .if ${MK_SOURCELESS_UCODE} != "no" -- cgit v1.2.3 From 9124ddeb4a551977cf6b2218291e7c666ce25f47 Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Tue, 13 Mar 2012 20:28:42 +0000 Subject: Add module building Makefile entries for NFSv4 and POSIX.1e ACL handling. --- sys/modules/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sys/modules/Makefile') diff --git a/sys/modules/Makefile b/sys/modules/Makefile index c2ddfe4fa707..ed32b1c6af3a 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -11,6 +11,8 @@ SUBDIR= ${_3dfx} \ accf_data \ accf_dns \ accf_http \ + acl_nfs4 \ + acl_posix1e \ ${_acpi} \ ae \ ${_aesni} \ -- cgit v1.2.3