Commit e75420dd authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] vivid: enable the vivid driver 



Update the Kconfig and Makefile files so this driver can be compiled.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 1fc78bc9

drivers/media/platform/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -264,6 +264,9 @@ menuconfig V4L_TEST_DRIVERS 
	depends on MEDIA_CAMERA_SUPPORT



if V4L_TEST_DRIVERS



source "drivers/media/platform/vivid/Kconfig"



config VIDEO_VIVI

	tristate "Virtual Video Driver"

	depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64

drivers/media/platform/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -15,8 +15,10 @@ obj-$(CONFIG_VIDEO_MMP_CAMERA) += marvell-ccic/ 
obj-$(CONFIG_VIDEO_OMAP3)	+= omap3isp/



obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o



obj-$(CONFIG_VIDEO_VIVI) += vivi.o



obj-$(CONFIG_VIDEO_VIVID)		+= vivid/

obj-$(CONFIG_VIDEO_MEM2MEM_TESTDEV) += mem2mem_testdev.o



obj-$(CONFIG_VIDEO_TI_VPE)		+= ti-vpe/

drivers/media/platform/vivid/Kconfig

0 → 100644
+19 −0
Original line number Diff line number Diff line 
config VIDEO_VIVID

	tristate "Virtual Video Test Driver"

	depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64

	select FONT_SUPPORT

	select FONT_8x16

	select VIDEOBUF2_VMALLOC

	default n

	---help---

	  Enables a virtual video driver. This driver emulates a webcam,

	  TV, S-Video and HDMI capture hardware, including VBI support for

	  the SDTV inputs. Also video output, VBI output, radio receivers,

	  transmitters and software defined radio capture is emulated.



	  It is highly configurable and is ideal for testing applications.

	  Error injection is supported to test rare errors that are hard

	  to reproduce in real hardware.



	  Say Y here if you want to test video apps or debug V4L devices.

	  When in doubt, say N.

drivers/media/platform/vivid/Makefile

0 → 100644
+6 −0
Original line number Diff line number Diff line 
vivid-objs := vivid-core.o vivid-ctrls.o vivid-vid-common.o vivid-vbi-gen.o \

		vivid-vid-cap.o vivid-vid-out.o vivid-kthread-cap.o vivid-kthread-out.o \

		vivid-radio-rx.o vivid-radio-tx.o vivid-radio-common.o \

		vivid-rds-gen.o vivid-sdr-cap.o vivid-vbi-cap.o vivid-vbi-out.o \

		vivid-osd.o vivid-tpg.o vivid-tpg-colors.o

obj-$(CONFIG_VIDEO_VIVID) += vivid.o