Revert "UBUNTU: [Config] make Intel IPU6 modules amd64 only"

BugLink: https://bugs.launchpad.net/bugs/1955383
This reverts commit 4bfb2564b7cb99f3a492c11c593a332eace03f5a.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 5961ed60a770a16899918bb4867f690702223c0d..874043455d42e140f1a3eef22f5a1e13b4df499d 100644 (file)
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -666,8 +666,6 @@ CONFIG_VFIO_IOMMU_TYPE1=y
 CONFIG_VFIO_PCI=y
 CONFIG_VFIO_PCI_CORE=y
 CONFIG_VFIO_VIRQFD=y
-CONFIG_VIDEO_INTEL_IPU6=m
-CONFIG_VIDEO_OV01A10=m
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VME_BUS=y
 CONFIG_VMXNET3=m

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index d189ddeab26e2939040ad89aac692921b7d23732..b29b955240d5085b5892f299d3ff305ed6d70bb7 100644 (file)
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -1923,7 +1923,6 @@ CONFIG_GPIO_GRGPIO                              policy<{'arm64': 'm', 'armhf': '
 CONFIG_GPIO_HISI                                policy<{'arm64': 'm'}>
 CONFIG_GPIO_HLWD                                policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_GPIO_ICH                                 policy<{'amd64': 'm'}>
-CONFIG_GPIO_LJCA                                policy<{'amd64': 'm'}>
 CONFIG_GPIO_LOGICVC                             policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_GPIO_MB86S7X                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 CONFIG_GPIO_MENZ127                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
@@ -3197,7 +3196,6 @@ CONFIG_I2C_ROBOTFUZZ_OSIF                       policy<{'amd64': 'm', 'arm64': '
 CONFIG_I2C_TAOS_EVM                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 CONFIG_I2C_TINY_USB                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_I2C_VIPERBOARD                           policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_I2C_LJCA                                 policy<{'amd64': 'm'}>
 CONFIG_I2C_MLXCPLD                              policy<{'amd64': 'm'}>
 CONFIG_I2C_CROS_EC_TUNNEL                       policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm'}>
 CONFIG_I2C_XGENE_SLIMPRO                        policy<{'arm64': 'm'}>
@@ -4780,12 +4778,6 @@ CONFIG_INTEL_MEI                                policy<{'amd64': 'm'}>
 CONFIG_INTEL_MEI_ME                             policy<{'amd64': 'm'}>
 CONFIG_INTEL_MEI_TXE                            policy<{'amd64': 'm'}>
 CONFIG_INTEL_MEI_HDCP                           policy<{'amd64': 'm'}>
-CONFIG_INTEL_VSC                                policy<{'amd64': 'm', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
-CONFIG_INTEL_VSC_ACE                            policy<{'amd64': 'm'}>
-CONFIG_INTEL_VSC_ACE_DEBUG                      policy<{'amd64': 'm', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
-CONFIG_INTEL_VSC_CSI                            policy<{'amd64': 'm'}>
-CONFIG_INTEL_VSC_PSE                            policy<{'amd64': 'm', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
-CONFIG_INTEL_MEI_VSC                            policy<{'amd64': 'm'}>
 CONFIG_VMWARE_VMCI                              policy<{'amd64': 'm'}>
 CONFIG_ECHO                                     policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'n'}>
 CONFIG_CXL                                      policy<{'ppc64el': 'm'}>
@@ -4981,7 +4973,6 @@ CONFIG_RAVE_SP_CORE                             policy<{'amd64': 'm', 'arm64': '
 CONFIG_MFD_INTEL_M10_BMC                        policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_MFD_RSMU_I2C                             policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_MFD_RSMU_SPI                             policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_MFD_LJCA                                 policy<{'amd64': 'm', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
 #
 CONFIG_MFD_SM501                                note<boot essential on OMAP4>
 CONFIG_MFD_TPS65217                             mark<ENFORCED> note<boot essential on AM335x>
@@ -5106,10 +5097,6 @@ CONFIG_VIDEO_S5K5BAF                            policy<{'amd64': 'm', 'arm64': '
 CONFIG_VIDEO_CCS                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_VIDEO_ET8EK8                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_VIDEO_S5C73M3                            policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_POWER_CTRL_LOGIC                         policy<{'amd64': 'm', 'arm64': 'n'}>
-CONFIG_VIDEO_OV01A10                            policy<{'amd64': 'm', 'arm64': 'n'}>
-CONFIG_VIDEO_OV01A1S                            policy<{'amd64': 'm'}>
-CONFIG_VIDEO_HM11B1                             policy<{'amd64': 'm'}>
 
 # Menu: Device Drivers >> Multimedia support >> Media ancillary drivers >> Customise DVB Frontends
 CONFIG_DVB_STB0899                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
@@ -5407,7 +5394,6 @@ CONFIG_DVB_DDBRIDGE                             policy<{'amd64': 'm', 'arm64': '
 CONFIG_DVB_DDBRIDGE_MSIENABLE                   policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
 CONFIG_DVB_SMIPCIE                              policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_DVB_NETUP_UNIDVB                         policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
-CONFIG_VIDEO_INTEL_IPU6                         policy<{'amd64': 'm', 'arm64': 'n'}>
 CONFIG_VIDEO_IPU3_CIO2                          policy<{'amd64': 'm'}>
 CONFIG_CIO2_BRIDGE                              policy<{'amd64': 'y'}>
 CONFIG_VIDEO_PCI_SKELETON                       policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
@@ -8476,7 +8462,6 @@ CONFIG_SPI_HISI_SFC_V3XX                        policy<{'arm64': 'm'}>
 CONFIG_SPI_NXP_FLEXSPI                          policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_SPI_GPIO                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_SPI_IMX                                  policy<{'arm64': 'm', 'armhf-generic': 'm'}>
-CONFIG_SPI_LJCA                                 policy<{'amd64': 'm'}>
 CONFIG_SPI_LM70_LLP                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_SPI_FSL_SPI                              policy<{'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
 CONFIG_SPI_FSL_DSPI                             policy<{'arm64': 'm', 'armhf-generic': 'm'}>
@@ -9710,7 +9695,6 @@ CONFIG_USB_PCI                                  policy<{'amd64': 'y', 'arm64': '
 CONFIG_USB_UHCI_HCD                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
 CONFIG_USB_ROLE_SWITCH                          policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y'}>
 CONFIG_USB_ROLES_INTEL_XHCI                     policy<{'amd64': 'm'}>
-CONFIG_INTEL_LPSS_USB                           policy<{'amd64': 'm', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n'}>
 #
 CONFIG_USB_UHCI_HCD                             mark<ENFORCED> note<ensures USB 2.0/1.1 probe ordering> flag<REVIEW>
 

diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 005f99636ee3334a92e5c80cc41f761f03961d5f..98c3f7c64fa021cd37aa4fa225bccbd95d708336 100644 (file)
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -699,8 +699,6 @@ CONFIG_VFIO_IOMMU_TYPE1=m
 CONFIG_VFIO_PCI=m
 CONFIG_VFIO_PCI_CORE=m
 CONFIG_VFIO_VIRQFD=m
-# CONFIG_VIDEO_INTEL_IPU6 is not set
-# CONFIG_VIDEO_OV01A10 is not set
 CONFIG_VIDEO_TI_CAL_MC=y
 CONFIG_VIRTIO_MMIO=y
 CONFIG_VME_BUS=y

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index 7bffbd4da01a9f5aaaa6cf44bfe064f0e8289f14..67d7ee7fcbf36c35589986bc19efb017c132d0b6 100644 (file)
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -12187,6 +12187,7 @@ CONFIG_VIDEO_IMX_CSI=m
 CONFIG_VIDEO_IMX_MEDIA=m
 CONFIG_VIDEO_IMX_PXP=m
 CONFIG_VIDEO_IMX_VDOA=m
+CONFIG_VIDEO_INTEL_IPU6=m
 CONFIG_VIDEO_IPU3_CIO2=m
 CONFIG_VIDEO_IPU3_IMGU=m
 CONFIG_VIDEO_IR_I2C=m
@@ -12223,6 +12224,7 @@ CONFIG_VIDEO_OMAP2_VOUT_VRFB=y
 CONFIG_VIDEO_OMAP3=m
 # CONFIG_VIDEO_OMAP3_DEBUG is not set
 CONFIG_VIDEO_OMAP4=m
+CONFIG_VIDEO_OV01A10=m
 CONFIG_VIDEO_OV01A1S=m
 CONFIG_VIDEO_OV02A10=m
 CONFIG_VIDEO_OV13858=m