PERFORCE change 136202 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=136202

Change 136202 by kmacy at kmacy:entropy:iwarp on 2008/02/26 02:27:28

	make T3 firmware a separate build target
	
	Suggested by: Sam Leffler

Affected files ...

.. //depot/projects/iwarp/sys/conf/NOTES#7 edit
.. //depot/projects/iwarp/sys/conf/files#10 edit
.. //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#19 edit
.. //depot/projects/iwarp/sys/modules/cxgb/Makefile#5 edit
.. //depot/projects/iwarp/sys/modules/cxgb/cxgb/Makefile#10 edit
.. //depot/projects/iwarp/sys/modules/cxgb/cxgb_t3fw/Makefile#1 add

Differences ...

==== //depot/projects/iwarp/sys/conf/NOTES#7 (text+ko) ====

@@ -1883,6 +1883,7 @@
 device		bfe		# Broadcom BCM440x 10/100 Ethernet
 device		bge		# Broadcom BCM570xx Gigabit Ethernet
 device		cxgb		# Chelsio T3 10 Gigabit Ethernet
+device		cxgb_t3fw	# Chelsio T3 10 Gigabit Ethernet firmware - must either be availables as module or linked in
 device		dc		# DEC/Intel 21143 and various workalikes
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 hint.fxp.0.prefer_iomap="0"

==== //depot/projects/iwarp/sys/conf/files#10 (text+ko) ====

@@ -514,21 +514,21 @@
 dev/cs/if_cs_isa.c		optional cs isa
 dev/cs/if_cs_pccard.c		optional cs pccard
 dev/cxgb/cxgb_main.c		optional cxgb pci
-dev/cxgb/cxgb_offload.c		optional cxgb pci
-dev/cxgb/cxgb_l2t.c		optional cxgb pci
-dev/cxgb/cxgb_lro.c		optional cxgb pci
-dev/cxgb/cxgb_sge.c		optional cxgb pci
-dev/cxgb/cxgb_multiq.c		optional cxgb pci
-dev/cxgb/cxgb_t3fw.c		optional cxgb pci
-dev/cxgb/common/cxgb_mc5.c	optional cxgb pci
-dev/cxgb/common/cxgb_vsc7323.c	optional cxgb pci
-dev/cxgb/common/cxgb_vsc8211.c	optional cxgb pci
-dev/cxgb/common/cxgb_ael1002.c	optional cxgb pci
-dev/cxgb/common/cxgb_mv88e1xxx.c	optional cxgb pci
-dev/cxgb/common/cxgb_xgmac.c	optional cxgb pci
-dev/cxgb/common/cxgb_t3_hw.c	optional cxgb pci
-dev/cxgb/sys/uipc_mvec.c	optional cxgb pci
-dev/cxgb/sys/cxgb_support.c	optional cxgb pci
+dev/cxgb/cxgb_offload.c		optional cxgb pci 
+dev/cxgb/cxgb_l2t.c		optional cxgb pci 
+dev/cxgb/cxgb_lro.c		optional cxgb pci 
+dev/cxgb/cxgb_sge.c		optional cxgb pci 
+dev/cxgb/cxgb_multiq.c		optional cxgb pci 
+dev/cxgb/common/cxgb_mc5.c	optional cxgb pci 
+dev/cxgb/common/cxgb_vsc7323.c	optional cxgb pci 
+dev/cxgb/common/cxgb_vsc8211.c	optional cxgb pci 
+dev/cxgb/common/cxgb_ael1002.c	optional cxgb pci 
+dev/cxgb/common/cxgb_mv88e1xxx.c	optional cxgb pci 
+dev/cxgb/common/cxgb_xgmac.c	optional cxgb pci 
+dev/cxgb/common/cxgb_t3_hw.c	optional cxgb pci 
+dev/cxgb/sys/uipc_mvec.c	optional cxgb pci 
+dev/cxgb/sys/cxgb_support.c	optional cxgb pci 
+dev/cxgb/cxgb_t3fw.c		optional cxgb_t3fw 
 dev/cy/cy.c			optional cy
 dev/cy/cy_isa.c			optional cy isa
 dev/cy/cy_pci.c			optional cy pci

==== //depot/projects/iwarp/sys/dev/cxgb/cxgb_main.c#19 (text+ko) ====

@@ -2682,3 +2682,6 @@
 	reg_block_dump(sc, buf, XGM_REG(A_XGM_SERDES_STATUS0, 1),
 		       XGM_REG(A_XGM_RX_SPI4_SOP_EOP_CNT, 1));
 }
+
+
+MODULE_DEPEND(if_cxgb, cxgb_t3fw, 1, 1, 1);

==== //depot/projects/iwarp/sys/modules/cxgb/Makefile#5 (text+ko) ====

@@ -3,5 +3,6 @@
 SUBDIR+= toecore
 SUBDIR+= tom
 SUBDIR+= iw_cxgb
+SUBDIR+= cxgb_t3fw
 
 .include <bsd.subdir.mk>

==== //depot/projects/iwarp/sys/modules/cxgb/cxgb/Makefile#10 (text+ko) ====

@@ -8,7 +8,7 @@
 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 cxgb_t3fw.c
+SRCS+=	uipc_mvec.c cxgb_support.c 
 SRCS+=	cxgb_multiq.c 
 
 CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -DDEFAULT_JUMBO -I${CXGB} -DSMP
@@ -41,6 +41,4 @@
 
 
 .endif
-
-
 .include <bsd.kmod.mk>