Author: brueffer
Date: Sat Aug 30 13:47:05 2014
New Revision: 270842
URL: http://svnweb.freebsd.org/changeset/base/270842
Log:
Allow the iwn(4) fw 100 to be compiled into the kernel and update the
relevant manpages.
Modified:
head/share/man/man4/iwn.4
head/share/man/man4/iwnfw.4
head/sys/conf/files
Modified: head/share/man/man4/iwn.4
==============================================================================
--- head/share/man/man4/iwn.4 Sat Aug 30 13:28:10 2014 (r270841)
+++ head/share/man/man4/iwn.4 Sat Aug 30 13:47:05 2014 (r270842)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 14, 2014
+.Dd August 30, 2014
.Dt IWN 4
.Os
.Sh NAME
@@ -46,6 +46,7 @@ You also need to select a firmware for y
Choose one from:
.Bd -ragged -offset indent
.Cd "device iwn1000fw"
+.Cd "device iwn100fw"
.Cd "device iwn105fw"
.Cd "device iwn135fw"
.Cd "device iwn2000fw"
@@ -72,6 +73,7 @@ module at boot time, place the following
.Bd -literal -offset indent
if_iwn_load="YES"
iwn1000fw_load="YES"
+iwn100fw_load="YES"
iwn105fw_load="YES"
iwn135fw_load="YES"
iwn2000fw_load="YES"
Modified: head/share/man/man4/iwnfw.4
==============================================================================
--- head/share/man/man4/iwnfw.4 Sat Aug 30 13:28:10 2014 (r270841)
+++ head/share/man/man4/iwnfw.4 Sat Aug 30 13:47:05 2014 (r270842)
@@ -22,7 +22,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd August 14, 2014
+.Dd August 30, 2014
.Dt IWNFW 4
.Os
.Sh NAME
@@ -43,6 +43,7 @@ If you want to pick only the firmware im
of the following:
.Bd -ragged -offset indent
.Cd "device iwn1000fw"
+.Cd "device iwn100fw"
.Cd "device iwn105fw"
.Cd "device iwn135fw"
.Cd "device iwn2000fw"
@@ -61,6 +62,7 @@ module at boot time, place the following
.Xr loader.conf 5 :
.Bd -literal -offset indent
iwn1000fw_load="YES"
+iwn100fw_load="YES"
iwn105fw_load="YES"
iwn135fw_load="YES"
iwn2000fw_load="YES"
@@ -75,7 +77,7 @@ iwn6050fw_load="YES"
.Ed
.Sh DESCRIPTION
This module provides access to firmware sets for the
-Intel Wireless WiFi Link 105, 135, 1000, 2000, 2030, 4965, 5000 and 6000
series of
+Intel Wireless WiFi Link 100, 105, 135, 1000, 2000, 2030, 4965, 5000 and 6000
series of
IEEE 802.11n adapters.
It may be
statically linked into the kernel, or loaded as a module.
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Sat Aug 30 13:28:10 2014 (r270841)
+++ head/sys/conf/files Sat Aug 30 13:47:05 2014 (r270842)
@@ -1602,6 +1602,20 @@ iwn1000.fw optional iwn1000fw |
iwnfw
compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "iwn1000.fw"
+iwn100fw.c optional iwn100fw | iwnfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwn100.fw:iwn100fw
-miwn100fw -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwn100fw.c"
+iwn100fw.fwo optional iwn100fw | iwnfw \
+ dependency "iwn100.fw" \
+ compile-with "${NORMAL_FWO}" \
+ no-implicit-rule \
+ clean "iwn100fw.fwo"
+iwn100.fw optional iwn100fw | iwnfw \
+ dependency "$S/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu" \
+ compile-with "${NORMAL_FW}" \
+ no-obj no-implicit-rule \
+ clean "iwn100.fw"
iwn105fw.c optional iwn105fw | iwnfw \
compile-with "${AWK} -f $S/tools/fw_stub.awk iwn105.fw:iwn105fw
-miwn105fw -c${.TARGET}" \
no-implicit-rule before-depend local \
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
