From a08bad447daffea5192be5129a8d909ef5671a9b Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Mon, 25 Apr 2022 10:33:37 +0800 Subject: [PATCH] ARM: configs: rv1106: Enable VIDEOBUF2_{CMA_SG|VMALLOC} default +CONFIG_VIDEOBUF2_CMA_SG=y +CONFIG_VIDEOBUF2_VMALLOC=y Signed-off-by: Sugar Zhang Change-Id: I7b8e6c89f5db6791628d0f681dc161a6a2879d01 --- arch/arm/configs/rv1106-evb.config | 4 ---- arch/arm/configs/rv1106-tb.config | 5 ----- arch/arm/configs/rv1106-uvc-spi-nor.config | 4 ---- arch/arm/configs/rv1106_defconfig | 2 ++ 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/arch/arm/configs/rv1106-evb.config b/arch/arm/configs/rv1106-evb.config index 66a5faf9b8a1..b451238af553 100644 --- a/arch/arm/configs/rv1106-evb.config +++ b/arch/arm/configs/rv1106-evb.config @@ -32,10 +32,6 @@ CONFIG_ROCKCHIP_VENDOR_STORAGE=y CONFIG_SPI=y CONFIG_USB_SUPPORT=y CONFIG_VFAT_FS=y -CONFIG_VIDEOBUF2_CORE=y -CONFIG_VIDEOBUF2_MEMOPS=y -CONFIG_VIDEOBUF2_V4L2=y -CONFIG_VIDEOBUF2_VMALLOC=y CONFIG_VIDEO_OS04A10=m CONFIG_VIDEO_SC3336=m CONFIG_VIDEO_SC4336=m diff --git a/arch/arm/configs/rv1106-tb.config b/arch/arm/configs/rv1106-tb.config index 72983b3ca7f1..1db50090f11a 100644 --- a/arch/arm/configs/rv1106-tb.config +++ b/arch/arm/configs/rv1106-tb.config @@ -14,11 +14,6 @@ CONFIG_ROCKCHIP_RGA_PROC_FS=y CONFIG_ROCKCHIP_THUNDER_BOOT=y CONFIG_ROMFS_FS=y CONFIG_SND_SOC_RV1106=m -CONFIG_VIDEOBUF2_CMA_SG=y -CONFIG_VIDEOBUF2_CORE=y -CONFIG_VIDEOBUF2_MEMOPS=y -CONFIG_VIDEOBUF2_V4L2=y -CONFIG_VIDEOBUF2_VMALLOC=y CONFIG_VIDEO_ROCKCHIP_CIF=y CONFIG_VIDEO_ROCKCHIP_ISP=y CONFIG_VIDEO_SC3336=y diff --git a/arch/arm/configs/rv1106-uvc-spi-nor.config b/arch/arm/configs/rv1106-uvc-spi-nor.config index 604c3d468136..fb75fe3af114 100644 --- a/arch/arm/configs/rv1106-uvc-spi-nor.config +++ b/arch/arm/configs/rv1106-uvc-spi-nor.config @@ -20,10 +20,6 @@ CONFIG_ROCKCHIP_VENDOR_STORAGE=y # CONFIG_RTC_CLASS is not set CONFIG_SPI=y CONFIG_USB_SUPPORT=y -CONFIG_VIDEOBUF2_CORE=y -CONFIG_VIDEOBUF2_MEMOPS=y -CONFIG_VIDEOBUF2_V4L2=y -CONFIG_VIDEOBUF2_VMALLOC=y CONFIG_VIDEO_SC530AI=m # CONFIG_AD2S1200 is not set # CONFIG_AD2S1210 is not set diff --git a/arch/arm/configs/rv1106_defconfig b/arch/arm/configs/rv1106_defconfig index f3aff66749b6..c4fdba681a6d 100644 --- a/arch/arm/configs/rv1106_defconfig +++ b/arch/arm/configs/rv1106_defconfig @@ -144,6 +144,8 @@ CONFIG_MEDIA_SUPPORT=y # CONFIG_MEDIA_SDR_SUPPORT is not set # CONFIG_MEDIA_TEST_SUPPORT is not set CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEOBUF2_CMA_SG=y +CONFIG_VIDEOBUF2_VMALLOC=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_ROCKCHIP_CIF=m CONFIG_VIDEO_ROCKCHIP_ISP=m