diff options
| author | Jon Medhurst <tixy@linaro.org> | 2014-04-15 11:51:16 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2014-04-15 11:51:16 +0100 |
| commit | cd3428916381f1b160cd062827092337e80d5a08 (patch) | |
| tree | 6be9e412604d11324a21cd4b5cc635c4049acfa0 /linaro | |
| parent | a376a6db2409aaf5ba781c14828520b0f64938a6 (diff) | |
| parent | 052a2ba5dbbb3268ac0524ad73e9b8a845606e69 (diff) | |
Merge branch 'tracking-armlt-config64' into integration-linaro-vexpress
Conflicts:
linaro/configs/vexpress64.conf
Diffstat (limited to 'linaro')
| -rw-r--r-- | linaro/configs/vexpress64.conf | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf index 2d0f201c444..194de7133c9 100644 --- a/linaro/configs/vexpress64.conf +++ b/linaro/configs/vexpress64.conf @@ -31,3 +31,16 @@ CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_MMIO=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_SMSC911X=y +CONFIG_I2C=y +CONFIG_I2C_DESIGNWARE_PLATFORM=y +CONFIG_USB_HIDDEV=y +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_USB_STORAGE=y +CONFIG_USB=y +CONFIG_USB_ULPI=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD_SYNOPSYS=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_OHCI_HCD=y |