diff options
| author | Tim Harvey <tharvey@gateworks.com> | 2024-01-18 11:19:30 -0800 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2024-02-02 17:31:44 +0100 |
| commit | 76b0d24157f26127db3b931e67c4d22ddbc3ff0b (patch) | |
| tree | ab58f7c0bb5ce8e06d35aef2edcc3e73fdd75dfb | |
| parent | 6a78fb0a9ec7505e9d8ddeea548518a119ef137c (diff) | |
| download | upstream-76b0d24157f26127db3b931e67c4d22ddbc3ff0b.tar.gz upstream-76b0d24157f26127db3b931e67c4d22ddbc3ff0b.tar.bz2 upstream-76b0d24157f26127db3b931e67c4d22ddbc3ff0b.zip | |
kernel: modules: video: fix video-core for 6.1
Linux 6.1 wraps core video drivers in a MEDIA_PLATFORM_DRIVERS submenu.
Enable that for 6.1 and add some new necessary undefines to
target/linux/generic/config-6.1 to avoid build failures.
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
| -rw-r--r-- | package/kernel/linux/modules/video.mk | 3 | ||||
| -rw-r--r-- | target/linux/generic/config-6.1 | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index 7bd1d468c7b..10da2ad3aa0 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -465,7 +465,8 @@ define KernelPackage/video-core CONFIG_MEDIA_SUPPORT \ CONFIG_MEDIA_CAMERA_SUPPORT=y \ CONFIG_VIDEO_DEV \ - CONFIG_V4L_PLATFORM_DRIVERS=y + CONFIG_V4L_PLATFORM_DRIVERS=y \ + CONFIG_MEDIA_PLATFORM_DRIVERS=y@ge6.1 FILES:= \ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videodev.ko AUTOLOAD:=$(call AutoLoad,60, videodev v4l2-common) diff --git a/target/linux/generic/config-6.1 b/target/linux/generic/config-6.1 index 80214d1efd2..ca130bd186b 100644 --- a/target/linux/generic/config-6.1 +++ b/target/linux/generic/config-6.1 @@ -7580,6 +7580,7 @@ CONFIG_VHOST_MENU=y # CONFIG_VIDEO_IMX412 is not set # CONFIG_VIDEO_IMX477 is not set # CONFIG_VIDEO_IMX8_JPEG is not set +# CONFIG_VIDEO_IMX_MIPI_CSIS is not set # CONFIG_VIDEO_IMX_PXP is not set # CONFIG_VIDEO_IRS1125 is not set # CONFIG_VIDEO_IR_I2C is not set @@ -7641,9 +7642,12 @@ CONFIG_VHOST_MENU=y # CONFIG_VIDEO_OV9650 is not set # CONFIG_VIDEO_OV9734 is not set # CONFIG_VIDEO_PVRUSB2 is not set +# CONFIG_VIDEO_RASPBERRYPI_PISP_BE is not set # CONFIG_VIDEO_RDACM20 is not set # CONFIG_VIDEO_RDACM21 is not set # CONFIG_VIDEO_RJ54N1 is not set +# CONFIG_VIDEO_ROCKCHIP_ISP1 is not set +# CONFIG_VIDEO_RP1_CFE is not set # CONFIG_VIDEO_S5C73M3 is not set # CONFIG_VIDEO_S5K4ECGX is not set # CONFIG_VIDEO_S5K5BAF is not set @@ -7662,6 +7666,8 @@ CONFIG_VHOST_MENU=y # CONFIG_VIDEO_SMIAPP is not set # CONFIG_VIDEO_SOLO6X10 is not set # CONFIG_VIDEO_SONY_BTF_MPX is not set +# CONFIG_VIDEO_SUN6I_CSI is not set +# CONFIG_VIDEO_SUN8I_A83T_MIPI_CSI2 is not set # CONFIG_VIDEO_SR030PC30 is not set # CONFIG_VIDEO_STK1160_COMMON is not set # CONFIG_VIDEO_ST_MIPID02 is not set |