From patchwork Fri Oct 4 14:25:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 280632 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id E25692C00C7 for ; Sat, 5 Oct 2013 00:25:40 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VS6Jz-0008Gp-Pg; Fri, 04 Oct 2013 14:25:35 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1VS6Jo-0008FP-L9 for kernel-team@lists.ubuntu.com; Fri, 04 Oct 2013 14:25:24 +0000 Received: from 2-230-238-136.ip204.fastwebnet.it ([2.230.238.136] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1VS6Jo-0006oW-DN for kernel-team@lists.ubuntu.com; Fri, 04 Oct 2013 14:25:24 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: [Config] arm: VIRTIO_[BLK|NET|MMIO]=y Date: Fri, 4 Oct 2013 16:25:21 +0200 Message-Id: <1380896721-4592-2-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1380896721-4592-1-git-send-email-paolo.pisati@canonical.com> References: <1380896721-4592-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com Signed-off-by: Paolo Pisati --- debian.master/abi/3.11.0-9.16/armhf/generic-lpae.modules | 5 ----- debian.master/config/amd64/config.common.amd64 | 4 ---- debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/armhf/config.flavour.generic | 5 ----- debian.master/config/armhf/config.flavour.generic-lpae | 5 ----- debian.master/config/config.common.ubuntu | 4 ++++ debian.master/config/i386/config.common.i386 | 4 ---- 7 files changed, 5 insertions(+), 23 deletions(-) diff --git a/debian.master/abi/3.11.0-9.16/armhf/generic-lpae.modules b/debian.master/abi/3.11.0-9.16/armhf/generic-lpae.modules index 4275d81..79556c4 100644 --- a/debian.master/abi/3.11.0-9.16/armhf/generic-lpae.modules +++ b/debian.master/abi/3.11.0-9.16/armhf/generic-lpae.modules @@ -2627,13 +2627,8 @@ videobuf-vmalloc videodev viperboard viperboard_adc -virtio virtio_balloon -virtio_blk virtio_console -virtio_mmio -virtio_net -virtio_ring virtio-rng virtio_scsi virtual diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 0e39499..0465943 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -105,11 +105,7 @@ CONFIG_USB_MUSB_TUSB6010=m CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VGASTATE=m -CONFIG_VIRTIO=y -CONFIG_VIRTIO_BALLOON=m -CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_MMIO=m -CONFIG_VIRTIO_NET=y CONFIG_WIL6210=m CONFIG_X86_MINIMUM_CPU_FAMILY=64 CONFIG_X86_SPEEDSTEP_LIB=m diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 6772937..2b5dfcb 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -77,4 +77,5 @@ CONFIG_USB_MUSB_HDRC=y # CONFIG_USB_MUSB_TUSB6010 is not set # CONFIG_USB_OHCI_HCD_PLATFORM is not set # CONFIG_VFIO_IOMMU_TYPE1 is not set +CONFIG_VIRTIO_MMIO=y # CONFIG_WIL6210 is not set diff --git a/debian.master/config/armhf/config.flavour.generic b/debian.master/config/armhf/config.flavour.generic index 4259a57..8b926aa 100644 --- a/debian.master/config/armhf/config.flavour.generic +++ b/debian.master/config/armhf/config.flavour.generic @@ -32,9 +32,4 @@ CONFIG_SND_SOC_TWL6040=y CONFIG_SPI_PXA2XX_PCI=m CONFIG_TEGRA_HOST1X=m CONFIG_VGASTATE=m -CONFIG_VIRTIO=y -# CONFIG_VIRTIO_BALLOON is not set -# CONFIG_VIRTIO_BLK is not set -# CONFIG_VIRTIO_MMIO is not set -# CONFIG_VIRTIO_NET is not set CONFIG_ZONE_DMA_FLAG=0 diff --git a/debian.master/config/armhf/config.flavour.generic-lpae b/debian.master/config/armhf/config.flavour.generic-lpae index 8ea0d6e..1ddadd3 100644 --- a/debian.master/config/armhf/config.flavour.generic-lpae +++ b/debian.master/config/armhf/config.flavour.generic-lpae @@ -32,9 +32,4 @@ CONFIG_SND_SOC_TWL6040=m # CONFIG_SPI_PXA2XX_PCI is not set # CONFIG_TEGRA_HOST1X is not set # CONFIG_VGASTATE is not set -CONFIG_VIRTIO=m -CONFIG_VIRTIO_BALLOON=m -CONFIG_VIRTIO_BLK=m -CONFIG_VIRTIO_MMIO=m -CONFIG_VIRTIO_NET=m CONFIG_ZONE_DMA_FLAG=1 diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index f2d6df3..33afedd 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -6813,8 +6813,12 @@ CONFIG_VIDEO_ZORAN_LML33=m CONFIG_VIDEO_ZORAN_LML33R10=m CONFIG_VIDEO_ZORAN_ZR36060=m CONFIG_VIPERBOARD_ADC=m +CONFIG_VIRTIO=y +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y +CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTUALIZATION=y CONFIG_VIRT_CPU_ACCOUNTING=y diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index 1ea114e..3bdb3be 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -103,11 +103,7 @@ CONFIG_USB_MUSB_TUSB6010=m CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_VFIO_IOMMU_TYPE1=m CONFIG_VGASTATE=m -CONFIG_VIRTIO=y -CONFIG_VIRTIO_BALLOON=m -CONFIG_VIRTIO_BLK=y CONFIG_VIRTIO_MMIO=m -CONFIG_VIRTIO_NET=y CONFIG_WIL6210=m CONFIG_X86_MINIMUM_CPU_FAMILY=5 CONFIG_X86_SPEEDSTEP_LIB=y