diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-02-20 20:42:59 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-02-20 20:42:59 +0400 |
| commit | f6e2f4a913773e061c16c1518e282bf6a44df137 (patch) | |
| tree | a051d153d12c22749453a55d0ccae3c5f10a411b | |
| parent | 30f68c171151747047cb78eabe7f949e44181e56 (diff) | |
| parent | c1becb07b0ba5315b62864ef8ebe8c9f5d78d07d (diff) | |
Merge remote-tracking branch 'linux-linaro-kvm/config-kvm' into ll-v3.8-misc-fixestracking-ll-v3.8-misc-fixes-ll-20130228.0tracking-ll-v3.8-misc-fixes-ll-20130221.0tracking-ll-v3.8-misc-fixes-ll-20130220.0
| -rw-r--r-- | linaro/configs/kvm-guest.conf | 2 | ||||
| -rw-r--r-- | linaro/configs/kvm-host.conf | 15 |
2 files changed, 16 insertions, 1 deletions
diff --git a/linaro/configs/kvm-guest.conf b/linaro/configs/kvm-guest.conf index ff2da8ba8877..00e84a3ba1ec 100644 --- a/linaro/configs/kvm-guest.conf +++ b/linaro/configs/kvm-guest.conf @@ -3,9 +3,9 @@ CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_NET=y CONFIG_HVC_DRIVER=y CONFIG_VIRTIO_CONSOLE=y -CONFIG_MMC_DEBUG=y CONFIG_VIRTIO=y CONFIG_VIRTIO_BALLOON=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y CONFIG_VIRTUALIZATION=y +# CONFIG_THUMB2_KERNEL is not set diff --git a/linaro/configs/kvm-host.conf b/linaro/configs/kvm-host.conf index ae280ac0703a..f47a2b05b4d4 100644 --- a/linaro/configs/kvm-host.conf +++ b/linaro/configs/kvm-host.conf @@ -1,3 +1,4 @@ +CONFIG_VIRTUALIZATION=y CONFIG_ARM_LPAE=y CONFIG_ARM_VIRT_EXT=y CONFIG_HAVE_KVM_IRQCHIP=y @@ -7,4 +8,18 @@ CONFIG_KVM_ARM_TIMER=y CONFIG_KVM_ARM_VGIC=y CONFIG_KVM_MMIO=y CONFIG_KVM=y +CONFIG_NFS_FS=m +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=m +CONFIG_NFS_SWAP=y +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y |