[linux-yocto] [PATCH 1/8] meta/common-pc: Refactor Ethernet and Wifi options

[Darren Hart]

Allow the reuse of these options by common-pc-64 and
provide a clear location for making networking configuration changes.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
---
 .../kernel-cache/bsp/common-pc/common-pc-eth.cfg   |   12 ++++++++++
 .../kernel-cache/bsp/common-pc/common-pc-wifi.cfg  |   14 ++++++++++++
 meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg  |   24 +-------------------
 meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc  |    2 ++
 4 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 meta/cfg/kernel-cache/bsp/common-pc/common-pc-eth.cfg
 create mode 100644 meta/cfg/kernel-cache/bsp/common-pc/common-pc-wifi.cfg

diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-eth.cfg b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-eth.cfg
new file mode 100644
index 0000000..5d5e316
--- /dev/null
+++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-eth.cfg
@@ -0,0 +1,12 @@
+# Common Ethernet networking devices (including QEMU and Common PCs)
+CONFIG_NET_CORE=y
+CONFIG_ETHERNET=y
+CONFIG_MII=y
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_TIGON3=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E1000=y
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_PCNET32=y
diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-wifi.cfg b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-wifi.cfg
new file mode 100644
index 0000000..d6028c3
--- /dev/null
+++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-wifi.cfg
@@ -0,0 +1,14 @@
+# Common Wifi
+CONFIG_NET=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_PCI=y
+CONFIG_NETDEVICES=y
+CONFIG_WLAN=y
+
+CONFIG_MAC80211=y
+CONFIG_CFG80211=y
+
+CONFIG_ATH_COMMON=y
+CONFIG_ATH_CARDS=y
+CONFIG_ATH5K=y
diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg b/meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg
index fbcbd50..73af92c 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg
+++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc.cfg
@@ -19,6 +19,7 @@ CONFIG_MICROCODE=y
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
 CONFIG_MTRR=y
+CONFIG_SMP=y
 
 CONFIG_PM=y
 
@@ -31,27 +32,6 @@ CONFIG_ATA_ACPI=y
 CONFIG_ATA_SFF=y
 CONFIG_ATA_PIIX=y
 
-CONFIG_NET_CORE=y
-CONFIG_MII=y
-
-# Enable the below for Dell Dimension 1100 PC / QEMU
-CONFIG_ETHERNET=y
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_TIGON3=y
-CONFIG_NET_VENDOR_ATHEROS=y
-CONFIG_ATL2=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_E1000=y
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_PCNET32=y
-
-CONFIG_CFG80211=y
-CONFIG_MAC80211=y
-CONFIG_WLAN=y
-CONFIG_ATH_COMMON=y
-CONFIG_ATH_CARDS=y
-CONFIG_ATH5K=y
-
 CONFIG_INPUT=y
 CONFIG_INPUT_MOUSEDEV=y
 CONFIG_INPUT_EVDEV=y
@@ -96,5 +76,3 @@ CONFIG_BLK_DEV_PIIX=y
 CONFIG_SATA_AHCI=y
 
 CONFIG_BLK_DEV_IDECD=y
-
-CONFIG_SMP=y
diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc b/meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc
index 260d5e4..4e63a29 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc
+++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc
@@ -1,5 +1,7 @@
 kconf hardware common-pc.cfg
+kconf hardware common-pc-eth.cfg
 kconf hardware common-pc-gfx.cfg
+kconf hardware common-pc-wifi.cfg
 
 include cfg/x86.scc
 include features/usb/ehci-hcd.scc
-- 
1.7.9.5