Author: erj
Date: Wed Jun 24 15:53:52 2015
New Revision: 284767
URL: https://svnweb.freebsd.org/changeset/base/284767
Log:
Several build changes for ix and ixv:
- Allow ix and ixv to be built seperately.
- Re-enable building ix for i386 and amd64 archs
- Fix ixv Makefile.
Approved by: jfv (mentor)
Modified:
head/sys/conf/files
head/sys/modules/Makefile
head/sys/modules/ixv/Makefile
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Wed Jun 24 15:52:26 2015 (r284766)
+++ head/sys/conf/files Wed Jun 24 15:53:52 2015 (r284767)
@@ -1774,31 +1774,31 @@ dev/ixgbe/if_ix.c optional ix inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP"
dev/ixgbe/if_ixv.c optional ixv inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP"
-dev/ixgbe/ix_txrx.c optional ix ixv inet \
- compile-with "${NORMAL_C} -I$S/dev/ixgbe -DSMP"
-dev/ixgbe/ixgbe_phy.c optional ix ixv inet \
+dev/ixgbe/ix_txrx.c optional ix inet | ixv inet \
+ compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixgbe/ixgbe_phy.c optional ix inet | ixv inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_api.c optional ix ixv inet \
+dev/ixgbe/ixgbe_api.c optional ix inet | ixv inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_common.c optional ix ixv inet \
+dev/ixgbe/ixgbe_common.c optional ix inet | ixv inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_mbx.c optional ix ixv inet \
+dev/ixgbe/ixgbe_mbx.c optional ix inet | ixv inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_vf.c optional ix ixv inet \
+dev/ixgbe/ixgbe_vf.c optional ix inet | ixv inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_82598.c optional ix ixv inet \
+dev/ixgbe/ixgbe_82598.c optional ix inet | ixv inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_82599.c optional ix ixv inet \
+dev/ixgbe/ixgbe_82599.c optional ix inet | ixv inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_x540.c optional ix ixv inet \
+dev/ixgbe/ixgbe_x540.c optional ix inet | ixv inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_x550.c optional ix ixv inet \
+dev/ixgbe/ixgbe_x550.c optional ix inet | ixv inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_dcb.c optional ix ixv inet \
+dev/ixgbe/ixgbe_dcb.c optional ix inet | ixv inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_dcb_82598.c optional ix ixv inet \
+dev/ixgbe/ixgbe_dcb_82598.c optional ix inet | ixv inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_dcb_82599.c optional ix ixv inet \
+dev/ixgbe/ixgbe_dcb_82599.c optional ix inet | ixv inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
dev/jme/if_jme.c optional jme pci
dev/joy/joy.c optional joy
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Wed Jun 24 15:52:26 2015 (r284766)
+++ head/sys/modules/Makefile Wed Jun 24 15:53:52 2015 (r284767)
@@ -174,9 +174,9 @@ SUBDIR= \
${_iwifw} \
${_iwn} \
${_iwnfw} \
- ${_ixgb} \
${_ix} \
${_ixv} \
+ ${_ixgb} \
${_ixl} \
${_ixlv} \
jme \
@@ -512,6 +512,7 @@ _io= io
.if ${MK_OFED} != "no" || defined(ALL_MODULES)
_ipoib= ipoib
.endif
+_ix= ix
_ixv= ixv
_linprocfs= linprocfs
_linsysfs= linsysfs
Modified: head/sys/modules/ixv/Makefile
==============================================================================
--- head/sys/modules/ixv/Makefile Wed Jun 24 15:52:26 2015
(r284766)
+++ head/sys/modules/ixv/Makefile Wed Jun 24 15:53:52 2015
(r284767)
@@ -7,8 +7,9 @@ SRCS = device_if.h bus_if.h pci_if.h
SRCS += opt_inet.h opt_inet6.h opt_rss.h
SRCS += if_ixv.c ix_txrx.c
# Shared source
-SRCS += ixgbe_common.c ixgbe_api.c ixgbe_phy.c
-SRCS += ixgbe_dcb.c ixgbe_mbx.c ixgbe_vf.c
+SRCS += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c
+SRCS += ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c
+SRCS += ixgbe_82598.c ixgbe_82599.c ixgbe_x540.c ixgbe_x550.c
CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP
.include <bsd.kmod.mk>
_______________________________________________
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"
