From: You-Sheng Yang Date: Fri, 11 Mar 2022 14:46:42 +0000 (+0800) Subject: UBUNTU: [Config] make Intel IPU6 modules amd64 only X-Git-Tag: Ubuntu-5.15.0-29.30~344 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=4bfb2564b7cb99f3a492c11c593a332eace03f5a;p=mirror_ubuntu-jammy-kernel.git UBUNTU: [Config] make Intel IPU6 modules amd64 only BugLink: https://bugs.launchpad.net/bugs/1955383 Signed-off-by: You-Sheng Yang Acked-by: Andrea Righi Acked-by: Paolo Pisati --- diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index e56b097698f3..7d5e1210c4f0 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -666,6 +666,8 @@ 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 baee12b27fc7..478689f39ba8 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -1923,6 +1923,7 @@ 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'}> @@ -3196,6 +3197,7 @@ 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'}> @@ -4778,6 +4780,12 @@ 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'}> @@ -4973,6 +4981,7 @@ 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 CONFIG_MFD_TPS65217 mark note @@ -5097,6 +5106,10 @@ 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'}> @@ -5394,6 +5407,7 @@ 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'}> @@ -8462,6 +8476,7 @@ 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'}> @@ -9695,6 +9710,7 @@ 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 note flag diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 98c3f7c64fa0..005f99636ee3 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -699,6 +699,8 @@ 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 0d44d67e9ea1..a569e8fa144c 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -12187,7 +12187,6 @@ 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 @@ -12224,7 +12223,6 @@ 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