summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2012-12-19 22:11:33 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2012-12-19 22:11:33 +0400
commit8ecfd08aed1c373c97305e9e4f77925eb04038ec (patch)
treeb98d6e18e690d429328e9ed75278a7ed613256df
parentc541f3f2ac299132ed05f75a84cc6a78d01530a9 (diff)
parent8b2dc630bd8e739132635800bfdd6f957b848b74 (diff)
Merge remote-tracking branch 'configs/config-boards-tracking' into ll-v3.7-misc-fixestracking-ll-v3.7-misc-fixes-ll-20121221.0tracking-ll-v3.7-misc-fixes-ll-20121219.0
-rw-r--r--linaro/configs/vexpress64.conf6
1 files changed, 5 insertions, 1 deletions
diff --git a/linaro/configs/vexpress64.conf b/linaro/configs/vexpress64.conf
index 0d144d45fff0..5be50a2074ed 100644
--- a/linaro/configs/vexpress64.conf
+++ b/linaro/configs/vexpress64.conf
@@ -41,7 +41,8 @@ CONFIG_IP_PNP_BOOTP=y
# CONFIG_WIRELESS is not set
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y
-# CONFIG_BLK_DEV is not set
+CONFIG_BLK_DEV=y
+CONFIG_VIRTIO_BLK=y
CONFIG_SCSI=y
# CONFIG_SCSI_PROC_FS is not set
CONFIG_BLK_DEV_SD=y
@@ -68,6 +69,8 @@ CONFIG_LOGO=y
# CONFIG_HID_SUPPORT is not set
# CONFIG_USB_SUPPORT is not set
# CONFIG_IOMMU_SUPPORT is not set
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_MMIO=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
@@ -89,3 +92,4 @@ CONFIG_DEBUG_INFO=y
# CONFIG_FTRACE is not set
CONFIG_ATOMIC64_SELFTEST=y
CONFIG_DEBUG_ERRORS=y
+# CONFIG_GATOR is not set