summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2016-05-15 23:18:41 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2016-05-15 23:18:41 -0700
commitc31abf34278eef8f68585aa6b458ad7a5b4b535c (patch)
tree5babc89b225742071b2aa4df5ccf0b945ac03ea7
parentgen_configkernel: bug #486366, fix virtio kconfig. (diff)
downloadgenkernel-c31abf34278eef8f68585aa6b458ad7a5b4b535c.tar.gz
genkernel-c31abf34278eef8f68585aa6b458ad7a5b4b535c.tar.bz2
genkernel-c31abf34278eef8f68585aa6b458ad7a5b4b535c.zip
gen_configkernel: bug #486366, fix virtio kconfig options.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-rw-r--r--defaults/kernel-generic-config3
-rwxr-xr-xgen_configkernel.sh17
2 files changed, 17 insertions, 3 deletions
diff --git a/defaults/kernel-generic-config b/defaults/kernel-generic-config
index 7b8826d..aa4f11b 100644
--- a/defaults/kernel-generic-config
+++ b/defaults/kernel-generic-config
@@ -474,6 +474,9 @@ CONFIG_VIRTIO_NET=m
CONFIG_VMXNET3=m
CONFIG_HW_RANDOM_VIRTIO=m
CONFIG_VIRTIO_CONSOLE=m
+CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+
#
# SCSI device support
diff --git a/gen_configkernel.sh b/gen_configkernel.sh
index 7e74f32..390a6da 100755
--- a/gen_configkernel.sh
+++ b/gen_configkernel.sh
@@ -162,9 +162,20 @@ config_kernel() {
if isTrue ${CMD_VIRTIO}
then
for k in \
- CONFIG_PARAVIRT_GUEST CONFIG_VIRTIO_PCI CONFIG_VIRTIO_BALLOON \
- CONFIG_VIRTIO_MMIO CONFIG_VIRTIO_BLK CONFIG_SCSI_VIRTIO \
- CONFIG_VIRTIO_NET CONFIG_VHOST_NET ; do
+ CONFIG_VIRTIO \
+ CONFIG_VIRTIO_BALLOON \
+ CONFIG_VIRTIO_BLK \
+ CONFIG_VIRTIO_CONSOLE \
+ CONFIG_VIRTIO_INPUT \
+ CONFIG_VIRTIO_MMIO \
+ CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES \
+ CONFIG_VIRTIO_NET \
+ CONFIG_VIRTIO_PCI \
+ \
+ CONFIG_PARAVIRT_GUEST \
+ CONFIG_SCSI_VIRTIO \
+ CONFIG_VHOST_NET \
+ ; do
kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "$k" "y"
done
fi