aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2015-11-17 13:35:33 +0800
committerAlex Shi <alex.shi@linaro.org>2015-11-17 13:35:33 +0800
commit6844488aaa6b23d45106c9c3c3ba2f2ee4a612f9 (patch)
tree8add2122f78f187669685a64b4d4223352969950
parent4c9c5a306017efae3bb820e26fa9891f32ddf759 (diff)
parent011837f72748e4096c8729f024eeeb0cadc5da88 (diff)
Merge branch 'v4.1/topic/configs' into linux-linaro-lsk-v4.1lsk-v4.1-15.11
-rw-r--r--linaro/configs/vexpress64.conf15
1 files changed, 15 insertions, 0 deletions
diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf
index 7c35366b28f4..f88ca4ac062c 100644
--- a/linaro/configs/vexpress64.conf
+++ b/linaro/configs/vexpress64.conf
@@ -46,3 +46,18 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_HCD_PLATFORM=y
CONFIG_NOP_USB_XCEIV=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+CONFIG_PCI_HOST_GENERIC=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+CONFIG_PCIE_ECRC=y
+CONFIG_CONNECTOR=y
+CONFIG_ATA=y
+CONFIG_SATA_SIL24=y
+CONFIG_SKY2=y