3 files changed, 11 insertions, 58 deletions

diff --git a/sys/modules/cxgb/Makefile b/sys/modules/cxgb/Makefile
index 99a6a3e58a87..6e35a6ee0d86 100644
--- a/sys/modules/cxgb/Makefile
+++ b/sys/modules/cxgb/Makefile
@@ -1,45 +1,5 @@
 # $FreeBSD$
+SUBDIR= cxgb
+SUBDIR+= cxgb_t3fw
 
-CXGB = ${.CURDIR}/../../dev/cxgb
-.PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys
-
-KMOD=	if_cxgb
-SRCS=	cxgb_mc5.c cxgb_vsc8211.c cxgb_ael1002.c cxgb_mv88e1xxx.c 
-SRCS+=	cxgb_xgmac.c cxgb_vsc7323.c cxgb_t3_hw.c cxgb_main.c 
-SRCS+=  cxgb_sge.c cxgb_lro.c cxgb_offload.c cxgb_l2t.c
-SRCS+=	device_if.h bus_if.h pci_if.h opt_zero.h 
-SRCS+=	uipc_mvec.c
-
-CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -DDEFAULT_JUMBO -I${CXGB}
-#CFLAGS+= -DDEBUG -DDEBUG_PRINT
-#CFLAGS+= -DINVARIANT_SUPPORT -DINVARIANTS -DWITNESS
-
-
-.if ${MACHINE_ARCH} != "ia64"
-# ld is broken on ia64
-t3fw-4.7.0.bin: ${CXGB}/t3fw-4.7.0.bin.gz.uu
-	uudecode -p < ${CXGB}/t3fw-4.7.0.bin.gz.uu \
-	| gzip -dc > ${.TARGET}
-
-FIRMWS= t3fw-4.7.0.bin:t3fw470
-CLEANFILES+= t3fw-4.7.0.bin
-
-t3b_protocol_sram-1.1.0.bin: ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu
-	uudecode -p < ${CXGB}/t3b_protocol_sram-1.1.0.bin.gz.uu \
-	| gzip -dc > ${.TARGET}
-
-FIRMWS+= t3b_protocol_sram-1.1.0.bin:t3bps110
-CLEANFILES+= t3b_protocol_sram-1.1.0.bin
-
-t3b_tp_eeprom-1.1.0.bin: ${CXGB}/t3b_tp_eeprom-1.1.0.bin.gz.uu
-	uudecode -p < ${CXGB}/t3b_tp_eeprom-1.1.0.bin.gz.uu \
-	| gzip -dc > ${.TARGET}
-
-FIRMWS+= t3b_tp_eeprom-1.1.0.bin:t3btpe110
-CLEANFILES+= t3b_tp_eeprom-1.1.0.bin
-
-
-.endif
-
-
-.include <bsd.kmod.mk>
+.include <bsd.subdir.mk>
diff --git a/sys/modules/cxgb/cxgb/Makefile b/sys/modules/cxgb/cxgb/Makefile
index 3638d2e6e2ed..039032da8f6a 100644
--- a/sys/modules/cxgb/cxgb/Makefile
+++ b/sys/modules/cxgb/cxgb/Makefile
@@ -6,19 +6,13 @@ CXGB = ${.CURDIR}/../../../dev/cxgb
 KMOD=	if_cxgb
 SRCS=	cxgb_mc5.c cxgb_vsc8211.c cxgb_ael1002.c cxgb_mv88e1xxx.c 
 SRCS+=	cxgb_xgmac.c cxgb_vsc7323.c cxgb_t3_hw.c cxgb_main.c 
-SRCS+=  cxgb_sge.c cxgb_lro.c cxgb_offload.c cxgb_l2t.c
-SRCS+=	device_if.h bus_if.h pci_if.h opt_zero.h opt_sched.h opt_global.h 
-SRCS+=	uipc_mvec.c cxgb_support.c 
-SRCS+=	cxgb_multiq.c 
+SRCS+=  cxgb_sge.c cxgb_lro.c cxgb_offload.c 
+SRCS+=	device_if.h bus_if.h pci_if.h opt_zero.h 
+SRCS+=	uipc_mvec.c cxgb_support.c cxgb_multiq.c
 
-CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -DDEFAULT_JUMBO -I${CXGB} -DSMP
-CFLAGS+= -DDISABLE_MBUF_IOVEC
-#CFLAGS+= -DIFNET_MULTIQUEUE
-#CFLAGS+= -DDISABLE_MBUF_IOVEC
+CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -DDEFAULT_JUMBO -I${CXGB}
 #CFLAGS+= -DDEBUG -DDEBUG_PRINT
-#CFLAGS+= -DINVARIANT_SUPPORT -DINVARIANTS 
-#CFLAGS+= -DWITNESS
-#CFLAGS += -DLOCK_PROFILING
-#CFLAGS+= -DWITNESS
+#CFLAGS+= -DINVARIANT_SUPPORT -DINVARIANTS -DWITNESS
 
-.include <bsd.kmod.mk>
+
+.include <bsd.kmod.mk>
\ No newline at end of file
diff --git a/sys/modules/cxgb/cxgb_t3fw/Makefile b/sys/modules/cxgb/cxgb_t3fw/Makefile
index 0a097aa08e42..787c9d41fbcc 100644
--- a/sys/modules/cxgb/cxgb_t3fw/Makefile
+++ b/sys/modules/cxgb/cxgb_t3fw/Makefile
@@ -3,7 +3,6 @@
 CXGB = ${.CURDIR}/../../../dev/cxgb
 .PATH: ${CXGB} 
 
-KMOD= cxgb_t3fw
 SRCS+= cxgb_t3fw.c
 
-.include <bsd.kmod.mk>
\ No newline at end of file
+.include <bsd.kmod.mk>