UBUNTU: [Config] arm64: snapdragon: disable VIDEO_ADV7511, VIDEO_COBALT

BugLink: https://bugs.launchpad.net/bugs/1797154
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 173b6f777b63da07fa00870ea2293b0ab0480919..042d09e6864853f17d44107266d18c7fd54c40cc 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -514,6 +514,8 @@ CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_VIRQFD=m
 CONFIG_VGASTATE=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_COBALT=m
 CONFIG_VIRTIO_MMIO=y
 # CONFIG_VM86 is not set
 CONFIG_VME_BUS=y

diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic
index c09c6c6e8131a43062569d7a2ac60908b67bf4d5..4f774826a138a5381365acb3c7242c09b939d8e2 100644 (file)
--- a/debian.master/config/arm64/config.flavour.generic
+++ b/debian.master/config/arm64/config.flavour.generic
@@ -52,4 +52,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 30c744bf18eabeda80a4c49654fda0df430a093b..dfb04bd286ea2de3c2aff3235f7b7d822ceae3ca 100644 (file)
--- a/debian.master/config/arm64/config.flavour.snapdragon
+++ b/debian.master/config/arm64/config.flavour.snapdragon
@@ -52,4 +52,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 7815e0e973624424ed54edebe16d1f53ade948e6..30abd24e2ea3eb07478e90f7d5545351b1d17d5a 100644 (file)
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -531,6 +531,8 @@ CONFIG_VFIO=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_VIRQFD=m
 CONFIG_VGASTATE=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 5fc4aab9833d45e96359d5df1963ba9432712bd5..a9e50e50595921d6906ca52854ece7040c2a3087 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -9943,8 +9943,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
@@ -9961,7 +9959,6 @@ CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BT856=m
 CONFIG_VIDEO_BT866=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 0c9330e31315611d7ef9ff8f5f28e110558054e4..6029c21a821831bcad28140b4e833c0ad7eb108e 100644 (file)
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -506,6 +506,8 @@ CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_VIRQFD=m
 CONFIG_VGASTATE=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_COBALT=m
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VM86=y
 CONFIG_VME_BUS=y

diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 918f2bc39ac95874a706af563ca24510a26aa91e..21bdd552a16cdc35e539e28d925e60d562f740c1 100644 (file)
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -512,6 +512,8 @@ CONFIG_VFIO=y
 CONFIG_VFIO_PCI=y
 CONFIG_VFIO_VIRQFD=y
 CONFIG_VGASTATE=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_COBALT=m
 CONFIG_VIRTIO_MMIO=y
 # CONFIG_VIRT_CPU_ACCOUNTING_NATIVE is not set
 CONFIG_VME_BUS=y