Author: np
Date: Thu Sep 13 09:01:52 2012
New Revision: 240451
URL: http://svn.freebsd.org/changeset/base/240451

Log:
  Allow cxgbe to be built into a kernel with "device cxgbe."
  
  MFC after:    1 week

Modified:
  head/sys/conf/files
  head/sys/conf/kern.pre.mk

Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Thu Sep 13 08:13:01 2012        (r240450)
+++ head/sys/conf/files Thu Sep 13 09:01:52 2012        (r240451)
@@ -1090,6 +1090,40 @@ dev/cxgbe/t4_l2t.c               optional cxgbe pci \
        compile-with "${NORMAL_C} -I$S/dev/cxgbe"
 dev/cxgbe/common/t4_hw.c       optional cxgbe pci \
        compile-with "${NORMAL_C} -I$S/dev/cxgbe"
+t4fw_cfg.c             optional cxgbe                                  \
+       compile-with    "${AWK} -f $S/tools/fw_stub.awk t4fw_cfg.fw:t4fw_cfg 
t4fw_cfg_uwire.fw:t4fw_cfg_uwire t4fw.fw:t4fw -mt4fw_cfg -c${.TARGET}" \
+       no-implicit-rule before-depend local                            \
+       clean           "t4fw_cfg.c"
+t4fw_cfg.fwo           optional cxgbe                                  \
+       dependency      "t4fw_cfg.fw"                                   \
+       compile-with    "${NORMAL_FWO}"                                 \
+       no-implicit-rule                                                \
+       clean           "t4fw_cfg.fwo"
+t4fw_cfg.fw            optional cxgbe                                  \
+       dependency      "$S/dev/cxgbe/firmware/t4fw_cfg.txt"            \
+       compile-with    "${CP} ${.ALLSRC} ${.TARGET}"                   \
+       no-obj no-implicit-rule                                         \
+       clean           "t4fw_cfg.fw"
+t4fw_cfg_uwire.fwo     optional cxgbe                                  \
+       dependency      "t4fw_cfg_uwire.fw"                             \
+       compile-with    "${NORMAL_FWO}"                                 \
+       no-implicit-rule                                                \
+       clean           "t4fw_cfg_uwire.fwo"
+t4fw_cfg_uwire.fw      optional cxgbe                                  \
+       dependency      "$S/dev/cxgbe/firmware/t4fw_cfg_uwire.txt"      \
+       compile-with    "${CP} ${.ALLSRC} ${.TARGET}"                   \
+       no-obj no-implicit-rule                                         \
+       clean           "t4fw_cfg_uwire.fw"
+t4fw.fwo               optional cxgbe                                  \
+       dependency      "t4fw.fw"                                       \
+       compile-with    "${NORMAL_FWO}"                                 \
+       no-implicit-rule                                                \
+       clean           "t4fw.fwo"
+t4fw.fw                        optional cxgbe                                  
\
+       dependency      "$S/dev/cxgbe/firmware/t4fw-1.6.2.0.bin.uu"     \
+       compile-with    "${NORMAL_FW}"                                  \
+       no-obj no-implicit-rule                                         \
+       clean           "t4fw.fw"
 dev/cy/cy.c                    optional cy
 dev/cy/cy_isa.c                        optional cy isa
 dev/cy/cy_pci.c                        optional cy pci

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk   Thu Sep 13 08:13:01 2012        (r240450)
+++ head/sys/conf/kern.pre.mk   Thu Sep 13 09:01:52 2012        (r240451)
@@ -18,6 +18,7 @@ LDSCRIPT?=    $S/conf/${LDSCRIPT_NAME}
 M=             ${MACHINE_CPUARCH}
 
 AWK?=          awk
+CP?=           cp
 LINT?=         lint
 NM?=           nm
 OBJCOPY?=      objcopy
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to