Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bc3cb74 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] v4l: move v4l2 core into a separate directory 



Currently, the v4l2 core is mixed together with other non-core drivers.
Move them into a separate directory.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2ea4b442

drivers/media/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ source "drivers/media/common/tuners/Kconfig" 
# Video/Radio/Hybrid adapters

#



source "drivers/media/v4l2-core/Kconfig"

source "drivers/media/video/Kconfig"



source "drivers/media/radio/Kconfig"

drivers/media/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ ifeq ($(CONFIG_MEDIA_CONTROLLER),y) 
  obj-$(CONFIG_MEDIA_SUPPORT) += media.o

endif



obj-y += common/ rc/ video/

obj-y += v4l2-core/ common/ rc/ video/



obj-$(CONFIG_VIDEO_DEV) += radio/

obj-$(CONFIG_DVB_CORE)  += dvb/

drivers/media/v4l2-core/Kconfig

0 → 100644
+60 −0
Original line number Diff line number Diff line 
#

# Generic video config states

#



config VIDEO_V4L2

	tristate

	depends on VIDEO_DEV && VIDEO_V4L2_COMMON

	default y



config VIDEOBUF_GEN

	tristate



config VIDEOBUF_DMA_SG

	depends on HAS_DMA

	select VIDEOBUF_GEN

	tristate



config VIDEOBUF_VMALLOC

	select VIDEOBUF_GEN

	tristate



config VIDEOBUF_DMA_CONTIG

	depends on HAS_DMA

	select VIDEOBUF_GEN

	tristate



config VIDEOBUF_DVB

	tristate

	select VIDEOBUF_GEN



config VIDEO_TUNER

	tristate

	depends on MEDIA_TUNER



config V4L2_MEM2MEM_DEV

        tristate

        depends on VIDEOBUF2_CORE



config VIDEOBUF2_CORE

	tristate



config VIDEOBUF2_MEMOPS

	tristate



config VIDEOBUF2_DMA_CONTIG

	select VIDEOBUF2_CORE

	select VIDEOBUF2_MEMOPS

	tristate



config VIDEOBUF2_VMALLOC

	select VIDEOBUF2_CORE

	select VIDEOBUF2_MEMOPS

	tristate



config VIDEOBUF2_DMA_SG

	#depends on HAS_DMA

	select VIDEOBUF2_CORE

	select VIDEOBUF2_MEMOPS

	tristate

drivers/media/v4l2-core/Makefile

0 → 100644
+35 −0
Original line number Diff line number Diff line 
#

# Makefile for the V4L2 core

#



tuner-objs	:=	tuner-core.o



videodev-objs	:=	v4l2-dev.o v4l2-ioctl.o v4l2-device.o v4l2-fh.o \

			v4l2-event.o v4l2-ctrls.o v4l2-subdev.o

ifeq ($(CONFIG_COMPAT),y)

  videodev-objs += v4l2-compat-ioctl32.o

endif



obj-$(CONFIG_VIDEO_DEV) += videodev.o v4l2-int-device.o

obj-$(CONFIG_VIDEO_V4L2_COMMON) += v4l2-common.o



obj-$(CONFIG_VIDEO_TUNER) += tuner.o



obj-$(CONFIG_V4L2_MEM2MEM_DEV) += v4l2-mem2mem.o



obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o

obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o

obj-$(CONFIG_VIDEOBUF_DMA_CONTIG) += videobuf-dma-contig.o

obj-$(CONFIG_VIDEOBUF_VMALLOC) += videobuf-vmalloc.o

obj-$(CONFIG_VIDEOBUF_DVB) += videobuf-dvb.o



obj-$(CONFIG_VIDEOBUF2_CORE) += videobuf2-core.o

obj-$(CONFIG_VIDEOBUF2_MEMOPS) += videobuf2-memops.o

obj-$(CONFIG_VIDEOBUF2_VMALLOC) += videobuf2-vmalloc.o

obj-$(CONFIG_VIDEOBUF2_DMA_CONTIG) += videobuf2-dma-contig.o

obj-$(CONFIG_VIDEOBUF2_DMA_SG) += videobuf2-dma-sg.o



ccflags-y += -I$(srctree)/drivers/media/dvb/dvb-core

ccflags-y += -I$(srctree)/drivers/media/dvb/frontends

ccflags-y += -I$(srctree)/drivers/media/common/tuners