[PATCH 5/5] UBUNTU: [Config] arm64: snapdragon: disable VIDEO_ADV7511, VIDEO_COBALT

[Paolo Pisati]

BugLink: https://bugs.launchpad.net/bugs/1797154

Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
 debian.master/config/amd64/config.common.amd64       | 2 ++
 debian.master/config/arm64/config.flavour.generic    | 2 ++
 debian.master/config/arm64/config.flavour.snapdragon | 2 ++
 debian.master/config/armhf/config.common.armhf       | 2 ++
 debian.master/config/config.common.ubuntu            | 3 ---
 debian.master/config/i386/config.common.i386         | 2 ++
 debian.master/config/ppc64el/config.common.ppc64el   | 2 ++
 7 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index ff3d1b4760b7..57b40956eeb5 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -457,6 +457,8 @@ CONFIG_UWB=m
 CONFIG_VFIO=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_VIRQFD=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_COBALT=m
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m
diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic
index b64f12d03458..572f92f5a132 100644
--- a/debian.master/config/arm64/config.flavour.generic
+++ b/debian.master/config/arm64/config.flavour.generic
@@ -53,4 +53,6 @@ CONFIG_SPI_QUP=m
 CONFIG_SPMI=m
 CONFIG_SPMI_MSM_PMIC_ARB=m
 CONFIG_USB_ULPI_BUS=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_COBALT=m
 # CONFIG_WCN36XX_SNAPDRAGON_HACKS is not set
diff --git a/debian.master/config/arm64/config.flavour.snapdragon b/debian.master/config/arm64/config.flavour.snapdragon
index a7fd65e170f0..c77c23891031 100644
--- a/debian.master/config/arm64/config.flavour.snapdragon
+++ b/debian.master/config/arm64/config.flavour.snapdragon
@@ -53,4 +53,6 @@ CONFIG_SPI_QUP=y
 CONFIG_SPMI=y
 CONFIG_SPMI_MSM_PMIC_ARB=y
 CONFIG_USB_ULPI_BUS=y
+# CONFIG_VIDEO_ADV7511 is not set
+# CONFIG_VIDEO_COBALT is not set
 CONFIG_WCN36XX_SNAPDRAGON_HACKS=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index 1820b01b4fe5..5d2ddd9bc184 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -481,6 +481,8 @@ CONFIG_UWB=m
 CONFIG_VFIO=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_VIRQFD=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_COBALT=m
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 9767fe50b50c..ca03fddfbd6e 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -10166,8 +10166,6 @@ CONFIG_VIDEO_ADV7175=m
 # CONFIG_VIDEO_ADV7343 is not set
 # CONFIG_VIDEO_ADV7393 is not set
 # CONFIG_VIDEO_ADV748X is not set
-CONFIG_VIDEO_ADV7511=m
-# CONFIG_VIDEO_ADV7511_CEC is not set
 CONFIG_VIDEO_ADV7604=m
 # CONFIG_VIDEO_ADV7604_CEC is not set
 CONFIG_VIDEO_ADV7842=m
@@ -10186,7 +10184,6 @@ CONFIG_VIDEO_CADENCE=y
 CONFIG_VIDEO_CADENCE_CSI2RX=m
 CONFIG_VIDEO_CADENCE_CSI2TX=m
 CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_VIDEO_COBALT=m
 CONFIG_VIDEO_CODA=m
 CONFIG_VIDEO_CPIA2=m
 CONFIG_VIDEO_CS3308=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index e8f1a6d3c518..aa56728e1ae5 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -449,6 +449,8 @@ CONFIG_UWB=m
 CONFIG_VFIO=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_VIRQFD=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_COBALT=m
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 33e2fc125467..bcf009eb954e 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -456,6 +456,8 @@ CONFIG_UWB=m
 CONFIG_VFIO=y
 CONFIG_VFIO_PCI=y
 CONFIG_VFIO_VIRQFD=y
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_COBALT=m
 CONFIG_VIRTIO_MMIO=y
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
 CONFIG_VME_BUS=y
-- 
2.17.1