[linux-yocto] [PATCH 3/3] dca: refactor DCA based config options

[Saul Wold]

DCA was marked as a x86-64 item, so refactor accordingly to only include it for
64bit configurations.

Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
 bsp/intel-common/intel-corei7-64.scc | 3 +++
 features/dca/dca.cfg                 | 3 +++
 features/igb/igb.cfg                 | 2 --
 features/igb/igb.scc                 | 2 --
 features/ixgbe/ixgbe.cfg             | 1 -
 features/ixgbe/ixgbe.scc             | 2 --
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/bsp/intel-common/intel-corei7-64.scc b/bsp/intel-common/intel-corei7-64.scc
index 5554dbe..568221f 100644
--- a/bsp/intel-common/intel-corei7-64.scc
+++ b/bsp/intel-common/intel-corei7-64.scc
@@ -16,6 +16,9 @@ include bsp/haswell-wc/haswell-wc.scc
 include bsp/romley/romley.scc
 include bsp/mohonpeak/mohonpeak.scc
 
+# DCA is now 64 bit only, so inlcude it here.
+include features/dca/dca.scc
+
 # This line comes last as it has the final word on
 # CONFIG values.
 kconf hardware intel-corei7-64.cfg
diff --git a/features/dca/dca.cfg b/features/dca/dca.cfg
index 6bc77f1..9061e4f 100644
--- a/features/dca/dca.cfg
+++ b/features/dca/dca.cfg
@@ -1,2 +1,5 @@
 CONFIG_INTEL_IOATDMA=m
 CONFIG_DCA=m
+
+CONFIG_IGB_DCA=y
+CONFIG_IXGBE_DCA=y
diff --git a/features/igb/igb.cfg b/features/igb/igb.cfg
index 3978517..89216c9 100644
--- a/features/igb/igb.cfg
+++ b/features/igb/igb.cfg
@@ -1,4 +1,2 @@
-CONFIG_IGB_DCA=y
-
 CONFIG_IGB=m
 CONFIG_IGBVF=m
diff --git a/features/igb/igb.scc b/features/igb/igb.scc
index e1f5a88..f9ef1df 100644
--- a/features/igb/igb.scc
+++ b/features/igb/igb.scc
@@ -2,5 +2,3 @@ define KFEATURE_DESCRIPTION "Intel Gigabit functionality"
 define KFEATURE_COMPATIBILITY board
 
 kconf hardware igb.cfg
-
-include features/dca/dca.scc
diff --git a/features/ixgbe/ixgbe.cfg b/features/ixgbe/ixgbe.cfg
index 30e46ce..31d8b1d 100644
--- a/features/ixgbe/ixgbe.cfg
+++ b/features/ixgbe/ixgbe.cfg
@@ -1,5 +1,4 @@
 CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
 
 CONFIG_DCB=y
 CONFIG_IXGBE_DCB=y
diff --git a/features/ixgbe/ixgbe.scc b/features/ixgbe/ixgbe.scc
index d22aa5c..671a158 100644
--- a/features/ixgbe/ixgbe.scc
+++ b/features/ixgbe/ixgbe.scc
@@ -1,3 +1 @@
 kconf hardware ixgbe.cfg
-
-include features/dca/dca.scc
-- 
2.5.0