9 files changed, 109 insertions, 0 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 56bd40842779..9e9f671347a1 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -122,9 +122,11 @@ SUBDIR=	${_3dfx} \
 	${_ipmi} \
 	${_ips} \
 	${_ipw} \
+	${_ipwfw} \
 	isp \
 	ispfw \
 	${_iwi} \
+	${_iwifw} \
 	${_ixgb} \
 	joy \
 	kbdmux \
@@ -423,7 +425,9 @@ _iir=		iir
 _ipmi=		ipmi
 _ips=		ips
 _ipw=		ipw
+_ipwfw=		ipwfw
 _iwi=		iwi
+_iwifw=		iwifw
 _ixgb=   	ixgb
 _mly=		mly
 _mxge=		mxge
@@ -475,6 +479,7 @@ _io=		io
 _ipmi=		ipmi
 _ips=		ips
 _ipw=		ipw
+_ipwfw=		ipwfw
 _ixgb=   	ixgb
 _linprocfs=	linprocfs
 _linsysfs=	linsysfs
diff --git a/sys/modules/ipwfw/Makefile b/sys/modules/ipwfw/Makefile
new file mode 100644
index 000000000000..83f4e6770239
--- /dev/null
+++ b/sys/modules/ipwfw/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+SUBDIR=	ipw_bss	\
+	ipw_ibss \
+	ipw_monitor
+
+.include <bsd.subdir.mk>
diff --git a/sys/modules/ipwfw/ipw_bss/Makefile b/sys/modules/ipwfw/ipw_bss/Makefile
new file mode 100644
index 000000000000..2f57711a3c97
--- /dev/null
+++ b/sys/modules/ipwfw/ipw_bss/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../contrib/dev/ipw
+
+KMOD=	ipw_bss
+FIRMWS=	ipw_bss:ipw_bss:130
+FIRMWARE_LICENSE=	intel_ipw
+
+CLEANFILES=	ipw_bss
+
+ipw_bss: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3.fw.uu
+	uudecode -p ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3.fw.uu > ${.TARGET}
+
+.include <bsd.kmod.mk>
+
diff --git a/sys/modules/ipwfw/ipw_ibss/Makefile b/sys/modules/ipwfw/ipw_ibss/Makefile
new file mode 100644
index 000000000000..10281b114a92
--- /dev/null
+++ b/sys/modules/ipwfw/ipw_ibss/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../contrib/dev/ipw
+
+KMOD=	ipw_ibss
+FIRMWS=	ipw_ibss:ipw_ibss:130
+FIRMWARE_LICENSE=	intel_ipw
+
+CLEANFILES=	ipw_ibss
+
+ipw_ibss: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-i.fw.uu
+	uudecode -p ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-i.fw.uu > ${.TARGET}
+
+.include <bsd.kmod.mk>
+
diff --git a/sys/modules/ipwfw/ipw_monitor/Makefile b/sys/modules/ipwfw/ipw_monitor/Makefile
new file mode 100644
index 000000000000..cdc28b22a9bb
--- /dev/null
+++ b/sys/modules/ipwfw/ipw_monitor/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../contrib/dev/ipw
+
+KMOD=	ipw_monitor
+FIRMWS=	ipw_monitor:ipw_monitor:130
+FIRMWARE_LICENSE=	intel_ipw
+
+CLEANFILES=	ipw_monitor
+
+ipw_monitor: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu
+	uudecode -p ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu > ${.TARGET}
+
+.include <bsd.kmod.mk>
+
diff --git a/sys/modules/iwifw/Makefile b/sys/modules/iwifw/Makefile
new file mode 100644
index 000000000000..55434c2ce60f
--- /dev/null
+++ b/sys/modules/iwifw/Makefile
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+SUBDIR=	iwi_bss	\
+	iwi_ibss \
+	iwi_monitor
+
+.include <bsd.subdir.mk>
diff --git a/sys/modules/iwifw/iwi_bss/Makefile b/sys/modules/iwifw/iwi_bss/Makefile
new file mode 100644
index 000000000000..5bb7a466091b
--- /dev/null
+++ b/sys/modules/iwifw/iwi_bss/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../contrib/dev/iwi
+
+KMOD=	iwi_bss
+FIRMWS=	iwi_bss:iwi_bss:300
+FIRMWARE_LICENSE=	intel_iwi
+
+CLEANFILES=	iwi_bss
+
+iwi_bss: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-bss.fw.uu
+	uudecode -p ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-bss.fw.uu > ${.TARGET}
+
+.include <bsd.kmod.mk>
+
diff --git a/sys/modules/iwifw/iwi_ibss/Makefile b/sys/modules/iwifw/iwi_ibss/Makefile
new file mode 100644
index 000000000000..35d06565c489
--- /dev/null
+++ b/sys/modules/iwifw/iwi_ibss/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../contrib/dev/iwi
+
+KMOD=	iwi_ibss
+FIRMWS=	iwi_ibss:iwi_ibss:300
+FIRMWARE_LICENSE=	intel_iwi
+
+CLEANFILES=	iwi_fw
+
+iwi_ibss: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-ibss.fw.uu
+	uudecode -p ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-ibss.fw.uu > ${.TARGET}
+
+.include <bsd.kmod.mk>
+
diff --git a/sys/modules/iwifw/iwi_monitor/Makefile b/sys/modules/iwifw/iwi_monitor/Makefile
new file mode 100644
index 000000000000..c05c6f1ee897
--- /dev/null
+++ b/sys/modules/iwifw/iwi_monitor/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../contrib/dev/iwi
+
+KMOD=	iwi_monitor
+FIRMWS=	iwi_monitor:iwi_monitor:300
+FIRMWARE_LICENSE=	intel_iwi
+
+CLEANFILES=	iwi_monitor
+
+iwi_monitor: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-sniffer.fw.uu
+	uudecode -p ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-sniffer.fw.uu > ${.TARGET}
+
+.include <bsd.kmod.mk>
+