From 8acaa11bfb658ef755bc9503156ccce6bf0fd307 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 1 May 2024 20:18:41 +0800 Subject: [PATCH] Revert "rockchip: pack Hantro VPU driver" Needs more work. This reverts commit 57128cc2ef999112c7cd83920b67b155631536b4. Signed-off-by: Tianling Shen --- target/linux/generic/config-6.6 | 1 - target/linux/rockchip/modules.mk | 19 ------------------- 2 files changed, 20 deletions(-) diff --git a/target/linux/generic/config-6.6 b/target/linux/generic/config-6.6 index b9cd03ece4..8a30901594 100644 --- a/target/linux/generic/config-6.6 +++ b/target/linux/generic/config-6.6 @@ -7891,7 +7891,6 @@ CONFIG_VHOST_MENU=y # CONFIG_VIDEO_RDACM21 is not set # CONFIG_VIDEO_RJ54N1 is not set # CONFIG_VIDEO_ROCKCHIP_ISP1 is not set -# CONFIG_VIDEO_ROCKCHIP_RGA is not set # CONFIG_VIDEO_RP1_CFE is not set # CONFIG_VIDEO_S5C73M3 is not set # CONFIG_VIDEO_S5K4ECGX is not set diff --git a/target/linux/rockchip/modules.mk b/target/linux/rockchip/modules.mk index 9899e6eb16..d69241f8f8 100644 --- a/target/linux/rockchip/modules.mk +++ b/target/linux/rockchip/modules.mk @@ -69,22 +69,3 @@ define KernelPackage/saradc-rockchip/description endef $(eval $(call KernelPackage,saradc-rockchip)) - -define KernelPackage/video-hantro-rockchip - SUBMENU:=$(VIDEO_MENU) - TITLE:=Hantro VPU support - DEPENDS:=@TARGET_rockchip kmod-video-core +kmod-video-mem2mem +kmod-video-dma - KCONFIG:= \ - CONFIG_VIDEO_HANTRO \ - CONFIG_VIDEO_HANTRO_ROCKCHIP=y - FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_MEM2MEM_DIR)/verisilicon/hantro-vpu.ko - AUTOLOAD:=$(call AutoProbe,hantro-vpu) - $(call AddDepends/video) -endef - -define KernelPackage/video-hantro-rockchip/description - Support for the Hantro IP based Video Processing Units present on - Rockchip SoCs, which accelerate video and image encoding and decoding. -endef - -$(eval $(call KernelPackage,video-hantro-rockchip))