[PATCH 1/2] UBUNTU: [Config] armhf: arm64: VIRTIO_[BLK|MMIO|NET|CONSOLE|BALLOON]=y

Wed Dec 11 14:51:55 UTC 2013

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.master/abi/3.13.0-0.5/arm64/generic.modules      | 1 -
 debian.master/abi/3.13.0-0.5/armhf/generic-lpae.modules | 6 ------
 debian.master/abi/3.13.0-0.5/armhf/generic.modules      | 1 -
 debian.master/config/amd64/config.common.amd64          | 6 +-----
 debian.master/config/arm64/config.common.arm64          | 6 +-----
 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               | 6 +++++-
 debian.master/config/i386/config.common.i386            | 6 +-----
 10 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/debian.master/abi/3.13.0-0.5/arm64/generic.modules b/debian.master/abi/3.13.0-0.5/arm64/generic.modules
index 0beb006..cf910d6 100644
--- a/debian.master/abi/3.13.0-0.5/arm64/generic.modules
+++ b/debian.master/abi/3.13.0-0.5/arm64/generic.modules
@@ -1815,7 +1815,6 @@ videobuf2-vmalloc
 videobuf-core
 videobuf-dma-contig
 videodev
-virtio_console
 virtio-rng
 virtio_scsi
 virtual
diff --git a/debian.master/abi/3.13.0-0.5/armhf/generic-lpae.modules b/debian.master/abi/3.13.0-0.5/armhf/generic-lpae.modules
index 2ee6c18..ac61496 100644
--- a/debian.master/abi/3.13.0-0.5/armhf/generic-lpae.modules
+++ b/debian.master/abi/3.13.0-0.5/armhf/generic-lpae.modules
@@ -2559,12 +2559,6 @@ videobuf-vmalloc
 videodev
 viperboard
 viperboard_adc
-virtio
-virtio_balloon
-virtio_blk
-virtio_console
-virtio_mmio
-virtio_net
 virtio_ring
 virtio-rng
 virtio_scsi
diff --git a/debian.master/abi/3.13.0-0.5/armhf/generic.modules b/debian.master/abi/3.13.0-0.5/armhf/generic.modules
index 5fee8d2..4f68b22 100644
--- a/debian.master/abi/3.13.0-0.5/armhf/generic.modules
+++ b/debian.master/abi/3.13.0-0.5/armhf/generic.modules
@@ -3371,7 +3371,6 @@ videobuf-vmalloc
 videodev
 viperboard
 viperboard_adc
-virtio_console
 virtio-rng
 virtio_rpmsg_bus
 virtio_scsi
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index b116d08..1f7f19b 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -117,11 +117,7 @@ CONFIG_USB_SUPPORT=y
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VGASTATE=m
 CONFIG_VGA_CONSOLE=y
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_MMIO=y
-CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_CONSOLE=m
 CONFIG_WIL6210=m
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIRELESS=y
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index a8c4736..3d86645 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -69,11 +69,7 @@ CONFIG_TICK_CPU_ACCOUNTING=y
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VGA_CONSOLE is not set
-CONFIG_VIRTIO=y
-# CONFIG_VIRTIO_BALLOON is not set
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_MMIO=y
-# CONFIG_VIRTIO_NET is not set
+CONFIG_VIRTIO_CONSOLE=y
 CONFIG_WIMAX_GDM72XX_SDIO=y
 # CONFIG_WIRELESS is not set
 # CONFIG_WLAN is not set
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index fefb665..48b5e83b 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -90,6 +90,7 @@ CONFIG_USB_MUSB_HDRC=y
 # CONFIG_USB_OHCI_HCD_PLATFORM is not set
 CONFIG_USB_SUPPORT=y
 # CONFIG_VFIO_IOMMU_TYPE1 is not set
+CONFIG_VIRTIO_CONSOLE=y
 # CONFIG_WIL6210 is not set
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIRELESS=y
diff --git a/debian.master/config/armhf/config.flavour.generic b/debian.master/config/armhf/config.flavour.generic
index 4ba2626..18656b5 100644
--- a/debian.master/config/armhf/config.flavour.generic
+++ b/debian.master/config/armhf/config.flavour.generic
@@ -30,9 +30,4 @@ CONFIG_SND_EMU10K1_SEQ=m
 CONFIG_SND_OPL3_LIB_SEQ=m
 CONFIG_SPI_PXA2XX_PCI=m
 CONFIG_VGASTATE=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_MMIO=y
-CONFIG_VIRTIO_NET=y
 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 2c4f438..34f7ec3 100644
--- a/debian.master/config/armhf/config.flavour.generic-lpae
+++ b/debian.master/config/armhf/config.flavour.generic-lpae
@@ -30,9 +30,4 @@ CONFIG_SATA_AHCI_PLATFORM=m
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SPI_PXA2XX_PCI 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 63810b4..3b4b56b 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -6836,8 +6836,12 @@ CONFIG_VIDEO_ZORAN_LML33=m
 CONFIG_VIDEO_ZORAN_LML33R10=m
 CONFIG_VIDEO_ZORAN_ZR36060=m
 CONFIG_VIPERBOARD_ADC=m
-CONFIG_VIRTIO_CONSOLE=m
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_BLK=y
+CONFIG_VIRTIO_MMIO=y
 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 7b2992b..836e42e 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -115,11 +115,7 @@ CONFIG_USB_SUPPORT=y
 CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VGASTATE=m
 CONFIG_VGA_CONSOLE=y
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_BLK=y
-CONFIG_VIRTIO_MMIO=y
-CONFIG_VIRTIO_NET=y
+CONFIG_VIRTIO_CONSOLE=m
 CONFIG_WIL6210=m
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIRELESS=y
-- 
1.8.3.2



