diff options
author | Anton Blanchard <anton@samba.org> | 2013-10-21 20:46:15 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-10-30 01:02:09 -0400 |
commit | 65508689d43afd0d8a3b659e83ed51b90c5083cf (patch) | |
tree | 4f343aba53ea71824e405ed5d64f3e3136adeac0 | |
parent | b7697592ef7c52aaf42879ae718a4b0a8a8b17dc (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_defconfig | 6 | ||||
-rw-r--r-- | arch/powerpc/configs/pseries_defconfig | 6 |
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 | |||
151 | CONFIG_BLK_DEV_NBD=m | 151 | CONFIG_BLK_DEV_NBD=m |
152 | CONFIG_BLK_DEV_RAM=y | 152 | CONFIG_BLK_DEV_RAM=y |
153 | CONFIG_BLK_DEV_RAM_SIZE=65536 | 153 | CONFIG_BLK_DEV_RAM_SIZE=65536 |
154 | CONFIG_VIRTIO_BLK=m | ||
154 | CONFIG_IDE=y | 155 | CONFIG_IDE=y |
155 | CONFIG_BLK_DEV_IDECD=y | 156 | CONFIG_BLK_DEV_IDECD=y |
156 | CONFIG_BLK_DEV_GENERIC=y | 157 | CONFIG_BLK_DEV_GENERIC=y |
@@ -179,6 +180,7 @@ CONFIG_SCSI_IPR=y | |||
179 | CONFIG_SCSI_QLA_FC=m | 180 | CONFIG_SCSI_QLA_FC=m |
180 | CONFIG_SCSI_QLA_ISCSI=m | 181 | CONFIG_SCSI_QLA_ISCSI=m |
181 | CONFIG_SCSI_LPFC=m | 182 | CONFIG_SCSI_LPFC=m |
183 | CONFIG_SCSI_VIRTIO=m | ||
182 | CONFIG_SCSI_DH=m | 184 | CONFIG_SCSI_DH=m |
183 | CONFIG_SCSI_DH_RDAC=m | 185 | CONFIG_SCSI_DH_RDAC=m |
184 | CONFIG_SCSI_DH_ALUA=m | 186 | CONFIG_SCSI_DH_ALUA=m |
@@ -216,6 +218,7 @@ CONFIG_DUMMY=m | |||
216 | CONFIG_NETCONSOLE=y | 218 | CONFIG_NETCONSOLE=y |
217 | CONFIG_NETPOLL_TRAP=y | 219 | CONFIG_NETPOLL_TRAP=y |
218 | CONFIG_TUN=m | 220 | CONFIG_TUN=m |
221 | CONFIG_VIRTIO_NET=m | ||
219 | CONFIG_VHOST_NET=m | 222 | CONFIG_VHOST_NET=m |
220 | CONFIG_VORTEX=y | 223 | CONFIG_VORTEX=y |
221 | CONFIG_ACENIC=m | 224 | CONFIG_ACENIC=m |
@@ -263,6 +266,7 @@ CONFIG_HVC_CONSOLE=y | |||
263 | CONFIG_HVC_RTAS=y | 266 | CONFIG_HVC_RTAS=y |
264 | CONFIG_HVC_BEAT=y | 267 | CONFIG_HVC_BEAT=y |
265 | CONFIG_HVCS=m | 268 | CONFIG_HVCS=m |
269 | CONFIG_VIRTIO_CONSOLE=m | ||
266 | CONFIG_IBM_BSR=m | 270 | CONFIG_IBM_BSR=m |
267 | CONFIG_RAW_DRIVER=y | 271 | CONFIG_RAW_DRIVER=y |
268 | CONFIG_I2C_CHARDEV=y | 272 | CONFIG_I2C_CHARDEV=y |
@@ -328,6 +332,8 @@ CONFIG_EDAC_MM_EDAC=y | |||
328 | CONFIG_EDAC_PASEMI=y | 332 | CONFIG_EDAC_PASEMI=y |
329 | CONFIG_RTC_CLASS=y | 333 | CONFIG_RTC_CLASS=y |
330 | CONFIG_RTC_DRV_DS1307=y | 334 | CONFIG_RTC_DRV_DS1307=y |
335 | CONFIG_VIRTIO_PCI=m | ||
336 | CONFIG_VIRTIO_BALLOON=m | ||
331 | CONFIG_EXT2_FS=y | 337 | CONFIG_EXT2_FS=y |
332 | CONFIG_EXT2_FS_XATTR=y | 338 | CONFIG_EXT2_FS_XATTR=y |
333 | CONFIG_EXT2_FS_POSIX_ACL=y | 339 | CONFIG_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 | |||
127 | CONFIG_BLK_DEV_NBD=m | 127 | CONFIG_BLK_DEV_NBD=m |
128 | CONFIG_BLK_DEV_RAM=y | 128 | CONFIG_BLK_DEV_RAM=y |
129 | CONFIG_BLK_DEV_RAM_SIZE=65536 | 129 | CONFIG_BLK_DEV_RAM_SIZE=65536 |
130 | CONFIG_VIRTIO_BLK=m | ||
130 | CONFIG_IDE=y | 131 | CONFIG_IDE=y |
131 | CONFIG_BLK_DEV_IDECD=y | 132 | CONFIG_BLK_DEV_IDECD=y |
132 | CONFIG_BLK_DEV_GENERIC=y | 133 | CONFIG_BLK_DEV_GENERIC=y |
@@ -152,6 +153,7 @@ CONFIG_SCSI_IPR=y | |||
152 | CONFIG_SCSI_QLA_FC=m | 153 | CONFIG_SCSI_QLA_FC=m |
153 | CONFIG_SCSI_QLA_ISCSI=m | 154 | CONFIG_SCSI_QLA_ISCSI=m |
154 | CONFIG_SCSI_LPFC=m | 155 | CONFIG_SCSI_LPFC=m |
156 | CONFIG_SCSI_VIRTIO=m | ||
155 | CONFIG_SCSI_DH=m | 157 | CONFIG_SCSI_DH=m |
156 | CONFIG_SCSI_DH_RDAC=m | 158 | CONFIG_SCSI_DH_RDAC=m |
157 | CONFIG_SCSI_DH_ALUA=m | 159 | CONFIG_SCSI_DH_ALUA=m |
@@ -180,6 +182,7 @@ CONFIG_DUMMY=m | |||
180 | CONFIG_NETCONSOLE=y | 182 | CONFIG_NETCONSOLE=y |
181 | CONFIG_NETPOLL_TRAP=y | 183 | CONFIG_NETPOLL_TRAP=y |
182 | CONFIG_TUN=m | 184 | CONFIG_TUN=m |
185 | CONFIG_VIRTIO_NET=m | ||
183 | CONFIG_VHOST_NET=m | 186 | CONFIG_VHOST_NET=m |
184 | CONFIG_VORTEX=y | 187 | CONFIG_VORTEX=y |
185 | CONFIG_ACENIC=m | 188 | CONFIG_ACENIC=m |
@@ -218,6 +221,7 @@ CONFIG_SERIAL_JSM=m | |||
218 | CONFIG_HVC_CONSOLE=y | 221 | CONFIG_HVC_CONSOLE=y |
219 | CONFIG_HVC_RTAS=y | 222 | CONFIG_HVC_RTAS=y |
220 | CONFIG_HVCS=m | 223 | CONFIG_HVCS=m |
224 | CONFIG_VIRTIO_CONSOLE=m | ||
221 | CONFIG_IBM_BSR=m | 225 | CONFIG_IBM_BSR=m |
222 | CONFIG_GEN_RTC=y | 226 | CONFIG_GEN_RTC=y |
223 | CONFIG_RAW_DRIVER=y | 227 | CONFIG_RAW_DRIVER=y |
@@ -259,6 +263,8 @@ CONFIG_INFINIBAND_IPOIB=m | |||
259 | CONFIG_INFINIBAND_IPOIB_CM=y | 263 | CONFIG_INFINIBAND_IPOIB_CM=y |
260 | CONFIG_INFINIBAND_SRP=m | 264 | CONFIG_INFINIBAND_SRP=m |
261 | CONFIG_INFINIBAND_ISER=m | 265 | CONFIG_INFINIBAND_ISER=m |
266 | CONFIG_VIRTIO_PCI=m | ||
267 | CONFIG_VIRTIO_BALLOON=m | ||
262 | CONFIG_EXT2_FS=y | 268 | CONFIG_EXT2_FS=y |
263 | CONFIG_EXT2_FS_XATTR=y | 269 | CONFIG_EXT2_FS_XATTR=y |
264 | CONFIG_EXT2_FS_POSIX_ACL=y | 270 | CONFIG_EXT2_FS_POSIX_ACL=y |