aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2013-10-21 20:46:15 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-10-30 01:02:09 -0400
commit65508689d43afd0d8a3b659e83ed51b90c5083cf (patch)
tree4f343aba53ea71824e405ed5d64f3e3136adeac0
parentb7697592ef7c52aaf42879ae718a4b0a8a8b17dc (diff)
powerpc: Enable virtio on ppc64 and pseries configs
Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--arch/powerpc/configs/ppc64_defconfig6
-rw-r--r--arch/powerpc/configs/pseries_defconfig6
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index f2e1d1ba51f8..581a3bcae728 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -151,6 +151,7 @@ CONFIG_BLK_DEV_LOOP=y
151CONFIG_BLK_DEV_NBD=m 151CONFIG_BLK_DEV_NBD=m
152CONFIG_BLK_DEV_RAM=y 152CONFIG_BLK_DEV_RAM=y
153CONFIG_BLK_DEV_RAM_SIZE=65536 153CONFIG_BLK_DEV_RAM_SIZE=65536
154CONFIG_VIRTIO_BLK=m
154CONFIG_IDE=y 155CONFIG_IDE=y
155CONFIG_BLK_DEV_IDECD=y 156CONFIG_BLK_DEV_IDECD=y
156CONFIG_BLK_DEV_GENERIC=y 157CONFIG_BLK_DEV_GENERIC=y
@@ -179,6 +180,7 @@ CONFIG_SCSI_IPR=y
179CONFIG_SCSI_QLA_FC=m 180CONFIG_SCSI_QLA_FC=m
180CONFIG_SCSI_QLA_ISCSI=m 181CONFIG_SCSI_QLA_ISCSI=m
181CONFIG_SCSI_LPFC=m 182CONFIG_SCSI_LPFC=m
183CONFIG_SCSI_VIRTIO=m
182CONFIG_SCSI_DH=m 184CONFIG_SCSI_DH=m
183CONFIG_SCSI_DH_RDAC=m 185CONFIG_SCSI_DH_RDAC=m
184CONFIG_SCSI_DH_ALUA=m 186CONFIG_SCSI_DH_ALUA=m
@@ -216,6 +218,7 @@ CONFIG_DUMMY=m
216CONFIG_NETCONSOLE=y 218CONFIG_NETCONSOLE=y
217CONFIG_NETPOLL_TRAP=y 219CONFIG_NETPOLL_TRAP=y
218CONFIG_TUN=m 220CONFIG_TUN=m
221CONFIG_VIRTIO_NET=m
219CONFIG_VHOST_NET=m 222CONFIG_VHOST_NET=m
220CONFIG_VORTEX=y 223CONFIG_VORTEX=y
221CONFIG_ACENIC=m 224CONFIG_ACENIC=m
@@ -263,6 +266,7 @@ CONFIG_HVC_CONSOLE=y
263CONFIG_HVC_RTAS=y 266CONFIG_HVC_RTAS=y
264CONFIG_HVC_BEAT=y 267CONFIG_HVC_BEAT=y
265CONFIG_HVCS=m 268CONFIG_HVCS=m
269CONFIG_VIRTIO_CONSOLE=m
266CONFIG_IBM_BSR=m 270CONFIG_IBM_BSR=m
267CONFIG_RAW_DRIVER=y 271CONFIG_RAW_DRIVER=y
268CONFIG_I2C_CHARDEV=y 272CONFIG_I2C_CHARDEV=y
@@ -328,6 +332,8 @@ CONFIG_EDAC_MM_EDAC=y
328CONFIG_EDAC_PASEMI=y 332CONFIG_EDAC_PASEMI=y
329CONFIG_RTC_CLASS=y 333CONFIG_RTC_CLASS=y
330CONFIG_RTC_DRV_DS1307=y 334CONFIG_RTC_DRV_DS1307=y
335CONFIG_VIRTIO_PCI=m
336CONFIG_VIRTIO_BALLOON=m
331CONFIG_EXT2_FS=y 337CONFIG_EXT2_FS=y
332CONFIG_EXT2_FS_XATTR=y 338CONFIG_EXT2_FS_XATTR=y
333CONFIG_EXT2_FS_POSIX_ACL=y 339CONFIG_EXT2_FS_POSIX_ACL=y
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index eafec1a622a8..e9a8b4e0a0f6 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -127,6 +127,7 @@ CONFIG_BLK_DEV_LOOP=y
127CONFIG_BLK_DEV_NBD=m 127CONFIG_BLK_DEV_NBD=m
128CONFIG_BLK_DEV_RAM=y 128CONFIG_BLK_DEV_RAM=y
129CONFIG_BLK_DEV_RAM_SIZE=65536 129CONFIG_BLK_DEV_RAM_SIZE=65536
130CONFIG_VIRTIO_BLK=m
130CONFIG_IDE=y 131CONFIG_IDE=y
131CONFIG_BLK_DEV_IDECD=y 132CONFIG_BLK_DEV_IDECD=y
132CONFIG_BLK_DEV_GENERIC=y 133CONFIG_BLK_DEV_GENERIC=y
@@ -152,6 +153,7 @@ CONFIG_SCSI_IPR=y
152CONFIG_SCSI_QLA_FC=m 153CONFIG_SCSI_QLA_FC=m
153CONFIG_SCSI_QLA_ISCSI=m 154CONFIG_SCSI_QLA_ISCSI=m
154CONFIG_SCSI_LPFC=m 155CONFIG_SCSI_LPFC=m
156CONFIG_SCSI_VIRTIO=m
155CONFIG_SCSI_DH=m 157CONFIG_SCSI_DH=m
156CONFIG_SCSI_DH_RDAC=m 158CONFIG_SCSI_DH_RDAC=m
157CONFIG_SCSI_DH_ALUA=m 159CONFIG_SCSI_DH_ALUA=m
@@ -180,6 +182,7 @@ CONFIG_DUMMY=m
180CONFIG_NETCONSOLE=y 182CONFIG_NETCONSOLE=y
181CONFIG_NETPOLL_TRAP=y 183CONFIG_NETPOLL_TRAP=y
182CONFIG_TUN=m 184CONFIG_TUN=m
185CONFIG_VIRTIO_NET=m
183CONFIG_VHOST_NET=m 186CONFIG_VHOST_NET=m
184CONFIG_VORTEX=y 187CONFIG_VORTEX=y
185CONFIG_ACENIC=m 188CONFIG_ACENIC=m
@@ -218,6 +221,7 @@ CONFIG_SERIAL_JSM=m
218CONFIG_HVC_CONSOLE=y 221CONFIG_HVC_CONSOLE=y
219CONFIG_HVC_RTAS=y 222CONFIG_HVC_RTAS=y
220CONFIG_HVCS=m 223CONFIG_HVCS=m
224CONFIG_VIRTIO_CONSOLE=m
221CONFIG_IBM_BSR=m 225CONFIG_IBM_BSR=m
222CONFIG_GEN_RTC=y 226CONFIG_GEN_RTC=y
223CONFIG_RAW_DRIVER=y 227CONFIG_RAW_DRIVER=y
@@ -259,6 +263,8 @@ CONFIG_INFINIBAND_IPOIB=m
259CONFIG_INFINIBAND_IPOIB_CM=y 263CONFIG_INFINIBAND_IPOIB_CM=y
260CONFIG_INFINIBAND_SRP=m 264CONFIG_INFINIBAND_SRP=m
261CONFIG_INFINIBAND_ISER=m 265CONFIG_INFINIBAND_ISER=m
266CONFIG_VIRTIO_PCI=m
267CONFIG_VIRTIO_BALLOON=m
262CONFIG_EXT2_FS=y 268CONFIG_EXT2_FS=y
263CONFIG_EXT2_FS_XATTR=y 269CONFIG_EXT2_FS_XATTR=y
264CONFIG_EXT2_FS_POSIX_ACL=y 270CONFIG_EXT2_FS_POSIX_ACL=y