summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2015-05-24 05:56:53 -0500
committerWaldemar Brodkorb <wbx@openadk.org>2015-05-30 10:59:29 -0500
commit87d36110191d53e38726d50a9bebd84dbb0053b4 (patch)
tree883b8582227b9cc2f44a0c77e5e79bfd25c633d8
parent86ab50a9469ae0b4da052a2323991233dbabee11 (diff)
rework multimedia kernel support
-rw-r--r--mk/modules.mk14
-rw-r--r--target/linux/Config.in2
-rw-r--r--target/linux/config/Config.in.multimedia (renamed from target/linux/config/Config.in.webcam)56
3 files changed, 49 insertions, 23 deletions
diff --git a/mk/modules.mk b/mk/modules.mk
index 0b14a5443..b515b4470 100644
--- a/mk/modules.mk
+++ b/mk/modules.mk
@@ -1808,3 +1808,17 @@ $(eval $(call KMOD_template,SND_BCM2708_SOC_IQAUDIO_DAC,snd-bcm2708-soc-iqaudio-
$(eval $(call KMOD_template,SND_BCM2708_SOC_RPI_PROTO,snd-bcm2708-soc-rpi-proto,\
$(MODULES_DIR)/kernel/sound/soc/bcm/snd-soc-rpi-proto \
,65, kmod-snd-bcm2708-soc-i2s))
+
+#
+# Multimedia
+#
+$(eval $(call KMOD_template,VIDEO_PVRUSB2,video-pvrusb2,\
+ $(MODULES_DIR)/kernel/drivers/media/v4l2-core/videodev \
+ $(MODULES_DIR)/kernel/drivers/media/v4l2-core/v4l2-common \
+ $(MODULES_DIR)/kernel/drivers/media/v4l2-core/tuner \
+ $(MODULES_DIR)/kernel/drivers/media/v4l2-core/v4l2-dv-timings \
+ $(MODULES_DIR)/kernel/drivers/media/common/cx2341x \
+ $(MODULES_DIR)/kernel/drivers/media/common/tveeprom \
+ $(MODULES_DIR)/kernel/drivers/media/dvb-core/dvb-core \
+ $(MODULES_DIR)/kernel/drivers/media/usb/pvrusb2/pvrusb2 \
+,70))
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 80cc14627..dd0fb43de 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -15,7 +15,7 @@ source target/linux/config/Config.in.pcmcia
source target/linux/config/Config.in.network
source target/linux/config/Config.in.netfilter
source target/linux/config/Config.in.audio
-source target/linux/config/Config.in.webcam
+source target/linux/config/Config.in.multimedia
source target/linux/config/Config.in.crypto
source target/linux/config/Config.in.bluetooth
source target/linux/config/Config.in.misc
diff --git a/target/linux/config/Config.in.webcam b/target/linux/config/Config.in.multimedia
index 00e0695da..0d94df232 100644
--- a/target/linux/config/Config.in.webcam
+++ b/target/linux/config/Config.in.multimedia
@@ -1,35 +1,50 @@
-menu "Webcam support"
+menu "Multimedia support"
depends on ADK_TARGET_WITH_USB
+config ADK_KERNEL_MEDIA_SUPPORT
+ tristate
+
config ADK_KERNEL_VIDEO_DEV
- boolean
+ bool
config ADK_KERNEL_VIDEO_V4L2
- boolean
+ bool
select ADK_KERNEL_VIDEO_DEV
config ADK_KERNEL_MEDIA_USB_SUPPORT
- boolean
+ bool
config ADK_KERNEL_MEDIA_CAMERA_SUPPORT
- boolean
+ bool
-config ADK_KERNEL_MEDIA_SUPPORT
- tristate
- default n
+config ADK_KERNEL_MEDIA_ANALOG_TV_SUPPORT
+ bool
+
+config ADK_KERNEL_MEDIA_DIGITAL_TV_SUPPORT
+ bool
+
+menu "DVB card support"
+
+config ADK_KERNEL_VIDEO_PVRUSB2
+ tristate "Hauppauge PVR DVB stick"
+ select ADK_KERNEL_MEDIA_SUPPORT
+ select ADK_KERNEL_MEDIA_USB_SUPPORT
+ select ADK_KERNEL_MEDIA_DIGITAL_TV_SUPPORT
+ select ADK_KERNEL_MEDIA_ANALOG_TV_SUPPORT
help
+ Driver for Hauppauge PVR f.e. WinTV-HVR 930C
+
+endmenu
+
+menu "Webcam support"
config ADK_KERNEL_USB_VIDEO_CLASS
- prompt "Kernel driver for USB video webcams"
- tristate
+ tristate "Kernel driver for USB video webcams"
depends on ADK_KERNEL_USB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG
select ADK_KERNEL_MEDIA_SUPPORT
- default n
- help
config ADK_KERNEL_USB_GSPCA
- prompt "GSPCA webcam framework"
- tristate
+ tristate "GSPCA webcam framework"
depends on ADK_TARGET_WITH_USB
select ADK_KERNEL_VIDEO_V4L2
select ADK_KERNEL_MEDIA_SUPPORT
@@ -39,28 +54,25 @@ config ADK_KERNEL_USB_GSPCA
GSPCA webcam framework
config ADK_KERNEL_USB_GSPCA_PAC207
- prompt "Pixart PAC207 USB Camera Driver"
- tristate
+ tristate "Pixart PAC207 USB Camera Driver"
depends on ADK_KERNEL_USB_GSPCA
help
config ADK_KERNEL_USB_GSPCA_PAC7311
- prompt "Pixart PAC7311 USB Camera Driver"
- tristate
+ tristate "Pixart PAC7311 USB Camera Driver"
depends on ADK_KERNEL_USB_GSPCA
help
config ADK_KERNEL_USB_GSPCA_SPCA561
- prompt "SPCA561 USB Camera Driver"
- tristate
+ tristate "SPCA561 USB Camera Driver"
depends on ADK_KERNEL_USB_GSPCA
help
config ADK_KERNEL_USB_PWC
- prompt "USB Philips Camera driver"
- tristate
+ tristate "USB Philips Camera driver"
depends on ADK_TARGET_WITH_USB
default n
help
endmenu
+endmenu