[yocto] [PATCH 4/6] fri2 update: drop NETDEVICE, e1xxx, usb-mass-storage, add iwlwifi feature

[Darren Hart]

Drop support for hardware that isn't present on the FRI2 or that is included by
other features (such as usb-mass-storage).

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
---
 meta/cfg/kernel-cache/bsp/fri2/fri2.cfg |    5 -----
 meta/cfg/kernel-cache/bsp/fri2/fri2.scc |    6 +-----
 2 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg b/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg
index 785877b..751956d 100644
--- a/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg
+++ b/meta/cfg/kernel-cache/bsp/fri2/fri2.cfg
@@ -3,7 +3,6 @@ CONFIG_MATOM=y
 CONFIG_PRINTK=y
 
 # Basic hardware support for the box - network, USB, PCI, sound
-CONFIG_NETDEVICES=y
 CONFIG_ATA=y
 CONFIG_PCI=y
 CONFIG_MMC=y
@@ -41,10 +40,6 @@ CONFIG_IEEE802154=y
 # Bluetooth Support
 CONFIG_BT=y
 
-# Intel 6205 ABGN
-# Build as a module to avoid having to install the firmware into the initrd
-CONFIG_IWLWIFI=m
-
 # I2C GPIO
 CONFIG_GPIO_PCA953X=y
 # I2C Accelerometer
diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2.scc b/meta/cfg/kernel-cache/bsp/fri2/fri2.scc
index 36bb805..3af8092 100644
--- a/meta/cfg/kernel-cache/bsp/fri2/fri2.scc
+++ b/meta/cfg/kernel-cache/bsp/fri2/fri2.scc
@@ -1,8 +1,6 @@
 kconf hardware fri2.cfg
 
 include features/eg20t/eg20t.scc
-include features/intel-e1xxxx/intel-e100.scc
-include features/intel-e1xxxx/intel-e1xxxx.scc
 include features/drm-emgd/drm-emgd.scc
 include cfg/dmaengine.scc
 include features/ericsson-3g/f5521gw.scc
@@ -12,6 +10,4 @@ include cfg/smp.scc
 include cfg/efi.scc
 include features/usb/ehci-hcd.scc
 include features/usb/ohci-hcd.scc
-
-# FIXME: this isn't a BSP specific feature
-include cfg/usb-mass-storage.scc
+include features/iwlwifi/iwlwifi.scc
-- 
1.7.5.4