[linux-yocto] [PATCH v4 13/14] pci: use the new pci config fragment in common-pc and intel-common

[Saul Wold]

This allows for the PCI config to be handled in a common feature
rather than from 2 or 3 different locations.

Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
 meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc         | 1 +
 meta/cfg/kernel-cache/bsp/common-pc/common-pc-drivers.cfg       | 3 ---
 meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc               | 1 +
 meta/cfg/kernel-cache/bsp/intel-common/intel-common-drivers.scc | 3 +++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc
index 8b1cc07..ece6d82 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc
+++ b/meta/cfg/kernel-cache/bsp/common-pc-64/common-pc-64.scc
@@ -5,6 +5,7 @@ kconf hardware bsp/common-pc/common-pc-gfx.cfg
 kconf hardware bsp/common-pc/common-pc-wifi.cfg
 
 include cfg/x86_64.scc
+include features/pci/pci.scc
 include features/usb/ehci-hcd.scc
 include features/usb/uhci-hcd.scc
 include features/usb/ohci-hcd.scc
diff --git a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-drivers.cfg b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-drivers.cfg
index 0b82190..7d92370 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc-drivers.cfg
+++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc-drivers.cfg
@@ -1,6 +1,3 @@
-CONFIG_PCI=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_PCI_MSI=y
 
 CONFIG_ATA=y
 CONFIG_ATA_ACPI=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 d97bc19..a43236b 100644
--- a/meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc
+++ b/meta/cfg/kernel-cache/bsp/common-pc/common-pc.scc
@@ -8,6 +8,7 @@ kconf hardware common-pc-wifi.cfg
 include cfg/efi-ext.scc
 
 include cfg/x86.scc
+include features/pci/pci.scc
 include features/usb/ehci-hcd.scc
 include features/usb/uhci-hcd.scc
 include features/usb/ohci-hcd.scc
diff --git a/meta/cfg/kernel-cache/bsp/intel-common/intel-common-drivers.scc b/meta/cfg/kernel-cache/bsp/intel-common/intel-common-drivers.scc
index ca26cd1..6aa720b 100644
--- a/meta/cfg/kernel-cache/bsp/intel-common/intel-common-drivers.scc
+++ b/meta/cfg/kernel-cache/bsp/intel-common/intel-common-drivers.scc
@@ -12,6 +12,9 @@ kconf hardware bsp/common-pc/common-pc-eth.cfg
 kconf hardware bsp/common-pc/common-pc-gfx.cfg
 kconf hardware bsp/common-pc/common-pc-wifi.cfg
 
+# PCI
+include features/pci/pci.scc
+
 # USB
 include features/usb/ehci-hcd.scc
 include features/usb/uhci-hcd.scc
-- 
2.1.0