From 7a1445acc7cd0eef202341b682391dd22777b553 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 11 Jul 2013 12:49:53 +0200 Subject: fix video cam support --- mk/modules.mk | 10 +- target/linux/Config.in | 4 +- target/linux/config/Config.in.audio | 132 ++++++++++++++++++++++ target/linux/config/Config.in.multimedia | 184 ------------------------------- target/linux/config/Config.in.video | 64 +++++++++++ 5 files changed, 203 insertions(+), 191 deletions(-) create mode 100644 target/linux/config/Config.in.audio delete mode 100644 target/linux/config/Config.in.multimedia create mode 100644 target/linux/config/Config.in.video diff --git a/mk/modules.mk b/mk/modules.mk index 70a17f429..4085a4c7d 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1208,23 +1208,23 @@ $(eval $(call KMOD_template,USB_VIDEO_CLASS,usb-video-class,\ ,70)) $(eval $(call KMOD_template,USB_GSPCA,usb-gspca,\ - $(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_main \ + $(MODULES_DIR)/kernel/drivers/media/usb/gspca/gspca_main \ ,75)) $(eval $(call KMOD_template,USB_GSPCA_PAC207,usb-gspca-pac207,\ - $(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_pac207 \ + $(MODULES_DIR)/kernel/drivers/media/usb/gspca/gspca_pac207 \ ,80)) $(eval $(call KMOD_template,USB_GSPCA_PAC7311,usb-gspca-pac7311,\ - $(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_pac7311 \ + $(MODULES_DIR)/kernel/drivers/media/usb/gspca/gspca_pac7311 \ ,80)) $(eval $(call KMOD_template,USB_GSPCA_SPCA561,usb-gspca-spca561,\ - $(MODULES_DIR)/kernel/drivers/media/video/gspca/gspca_spca561 \ + $(MODULES_DIR)/kernel/drivers/media/usb/gspca/gspca_spca561 \ ,80)) $(eval $(call KMOD_template,USB_PWC,usb-pwc,\ - $(MODULES_DIR)/kernel/drivers/media/video/pwc/pwc \ + $(MODULES_DIR)/kernel/drivers/media/usb/pwc/pwc \ ,80)) # diff --git a/target/linux/Config.in b/target/linux/Config.in index d7d9b5355..e4b81dd2f 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -10,14 +10,14 @@ source target/linux/config/Config.in.input 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.multimedia +source target/linux/config/Config.in.audio +source target/linux/config/Config.in.video source target/linux/config/Config.in.crypto source target/linux/config/Config.in.bluetooth #source target/linux/config/Config.in.isdn source target/linux/config/Config.in.watchdog source target/linux/config/Config.in.leds source target/linux/config/Config.in.misc -#source target/linux/config/Config.in.arm source target/linux/config/Config.in.mips source target/linux/config/Config.in.lib source target/linux/config/Config.in.pm diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio new file mode 100644 index 000000000..a7e8f4751 --- /dev/null +++ b/target/linux/config/Config.in.audio @@ -0,0 +1,132 @@ +menu "Audio devices support" +depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND + +config ADK_KERNEL_SND_ARM + boolean + +config ADK_KERNEL_SND_SOC + boolean + +config ADK_KERNEL_SND_PXA2XX_AC97 + boolean + +config ADK_KERNEL_SND_TIMER + boolean + +config ADK_KERNEL_SND_PCM + boolean + +config ADK_KERNEL_SND_HWDEP + boolean + +config ADK_KERNEL_SND_OSSEMUL + boolean + +config ADK_KERNEL_SND_MIXER_OSS + boolean + +config ADK_KERNEL_SND_PCM_OSS + boolean + +config ADK_KPACKAGE_KMOD_SOUND + tristate + +config ADK_KPACKAGE_KMOD_SND_RAWMIDI + tristate + +config ADK_KPACKAGE_KMOD_SND_AC97_CODEC + tristate + depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_SOUND + +config ADK_KPACKAGE_KMOD_SND + prompt "kmod-snd...................... ALSA sound support" + tristate + select ADK_KPACKAGE_KMOD_SOUND + select ADK_KERNEL_SND_OSSEMUL + select ADK_KERNEL_SND_TIMER + select ADK_KERNEL_SND_PCM + select ADK_KERNEL_SND_HWDEP + default n + help + Basic ALSA sound support. + +config ADK_KPACKAGE_KMOD_SND_OSSEMUL + prompt "kmod-snd-ossemul.............. ALSA OSS Emulation" + tristate + select ADK_KERNEL_SND_MIXER_OSS + select ADK_KERNEL_SND_PCM_OSS + select ADK_KPACKAGE_KMOD_SND + default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 + default n + help + ALSA OSS Emulation + +config ADK_KPACKAGE_KMOD_SND_INTEL8X0 + prompt "kmod-snd-intel8x0............. Intel AC97 driver" + tristate + select ADK_KPACKAGE_KMOD_SND_AC97_CODEC + select ADK_KPACKAGE_KMOD_SND + default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_IBM_X40 + default n + depends on ADK_TARGET_WITH_PCI + help + Driver for intel chipsets. + +config ADK_KPACKAGE_KMOD_SND_VIA82XX + prompt "kmod-snd-via82xx.............. ALSA VIA82XX driver" + tristate + select ADK_KPACKAGE_KMOD_SND + default n + depends on ADK_TARGET_WITH_PCI + help + ALSA VIA82XX driver + +config ADK_KPACKAGE_KMOD_SND_ENS1370 + prompt "kmod-snd-ens1370.............. ALSA Ensoniq 1370 driver" + tristate + select ADK_KPACKAGE_KMOD_SND + default n + depends on ADK_TARGET_WITH_PCI + help + ALSA Ensonique 1370 driver + +config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO + prompt "kmod-snd-cs5535audio.......... ALSA AMD CS5535 driver" + tristate + select ADK_KPACKAGE_KMOD_SND_AC97_CODEC + select ADK_KPACKAGE_KMOD_SND + default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C + default n + depends on ADK_TARGET_WITH_PCI + help + ALSA AMD CS5535 driver + +config ADK_KERNEL_SND_PXA2XX_SOC + tristate + default n + +config ADK_KPACKAGE_KMOD_SND_PXA2XX_SOC_SPITZ + prompt "kmod-snd-pxa2xx-soc-spitz..... ALSA SOC Sharp Zaurus" + tristate + select ADK_KERNEL_SND_ARM + select ADK_KERNEL_SND_SOC + select ADK_KERNEL_SND_PXA2XX_AC97 + select ADK_KPACKAGE_KMOD_SND_AC97_CODEC + select ADK_KPACKAGE_KMOD_SND + select ADK_KERNEL_SND_PXA2XX_SOC + depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS + default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS + default n + +config ADK_KPACKAGE_KMOD_SND_BCM2835 + prompt "kmod-snd-bcm2835............... ALSA SOC Raspberry PI" + tristate + select ADK_KERNEL_SND_ARM + depends on ADK_TARGET_SYSTEM_RASPBERRY_PI + default y if ADK_TARGET_SYSTEM_RASPBERRY_PI + default n + +endmenu diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia deleted file mode 100644 index 1dafff357..000000000 --- a/target/linux/config/Config.in.multimedia +++ /dev/null @@ -1,184 +0,0 @@ -menu "Multimedia devices support" -depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SOUND - -config ADK_KERNEL_SND_ARM - boolean - -config ADK_KERNEL_SND_SOC - boolean - -config ADK_KERNEL_SND_PXA2XX_AC97 - boolean - -config ADK_KERNEL_SND_TIMER - boolean - -config ADK_KERNEL_SND_PCM - boolean - -config ADK_KERNEL_SND_HWDEP - boolean - -config ADK_KERNEL_SND_OSSEMUL - boolean - -config ADK_KERNEL_SND_MIXER_OSS - boolean - -config ADK_KERNEL_SND_PCM_OSS - boolean - -config ADK_KPACKAGE_KMOD_SOUND - tristate - -config ADK_KPACKAGE_KMOD_SND_RAWMIDI - tristate - -config ADK_KPACKAGE_KMOD_SND_AC97_CODEC - tristate - depends on ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_SOUND - -menu "Audio devices support" - -config ADK_KPACKAGE_KMOD_SND - prompt "kmod-snd...................... ALSA sound support" - tristate - select ADK_KPACKAGE_KMOD_SOUND - select ADK_KERNEL_SND_OSSEMUL - select ADK_KERNEL_SND_TIMER - select ADK_KERNEL_SND_PCM - select ADK_KERNEL_SND_HWDEP - default n - help - Basic ALSA sound support. - -config ADK_KPACKAGE_KMOD_SND_OSSEMUL - prompt "kmod-snd-ossemul.............. ALSA OSS Emulation" - tristate - select ADK_KERNEL_SND_MIXER_OSS - select ADK_KERNEL_SND_PCM_OSS - select ADK_KPACKAGE_KMOD_SND - default y if ADK_TARGET_SYSTEM_IBM_X40 - default y if ADK_NATIVE_SYSTEM_IBM_X40 - default n - help - ALSA OSS Emulation - -config ADK_KPACKAGE_KMOD_SND_INTEL8X0 - prompt "kmod-snd-intel8x0............. Intel AC97 driver" - tristate - select ADK_KPACKAGE_KMOD_SND_AC97_CODEC - select ADK_KPACKAGE_KMOD_SND - default y if ADK_TARGET_SYSTEM_IBM_X40 - default y if ADK_NATIVE_SYSTEM_IBM_X40 - default n - depends on ADK_TARGET_WITH_PCI - help - Driver for intel chipsets. - -config ADK_KPACKAGE_KMOD_SND_VIA82XX - prompt "kmod-snd-via82xx.............. ALSA VIA82XX driver" - tristate - select ADK_KPACKAGE_KMOD_SND - default n - depends on ADK_TARGET_WITH_PCI - help - ALSA VIA82XX driver - -config ADK_KPACKAGE_KMOD_SND_ENS1370 - prompt "kmod-snd-ens1370.............. ALSA Ensoniq 1370 driver" - tristate - select ADK_KPACKAGE_KMOD_SND - default n - depends on ADK_TARGET_WITH_PCI - help - ALSA Ensonique 1370 driver - -config ADK_KPACKAGE_KMOD_SND_CS5535AUDIO - prompt "kmod-snd-cs5535audio.......... ALSA AMD CS5535 driver" - tristate - select ADK_KPACKAGE_KMOD_SND_AC97_CODEC - select ADK_KPACKAGE_KMOD_SND - default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG - default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C - default n - depends on ADK_TARGET_WITH_PCI - help - ALSA AMD CS5535 driver - -config ADK_KERNEL_SND_PXA2XX_SOC - tristate - default n - -config ADK_KPACKAGE_KMOD_SND_PXA2XX_SOC_SPITZ - prompt "kmod-snd-pxa2xx-soc-spitz..... ALSA SOC Sharp Zaurus" - tristate - select ADK_KERNEL_SND_ARM - select ADK_KERNEL_SND_SOC - select ADK_KERNEL_SND_PXA2XX_AC97 - select ADK_KPACKAGE_KMOD_SND_AC97_CODEC - select ADK_KPACKAGE_KMOD_SND - select ADK_KERNEL_SND_PXA2XX_SOC - depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS - default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS - default n - -config ADK_KPACKAGE_KMOD_SND_BCM2835 - prompt "kmod-snd-bcm2835............... ALSA SOC Raspberry PI" - tristate - select ADK_KERNEL_SND_ARM - depends on ADK_TARGET_SYSTEM_RASPBERRY_PI - default y if ADK_TARGET_SYSTEM_RASPBERRY_PI - default n - -endmenu - -menu "Video devices support" -config ADK_KPACKAGE_KMOD_MEDIA_SUPPORT - prompt "kmod-media-support............... Multimedia support" - tristate - default n - help - -config ADK_KPACKAGE_KMOD_USB_VIDEO_CLASS - prompt "kmod-usb-video-class............ Kernel driver for USB video webcams" - tristate - depends on ADK_KPACKAGE_KMOD_USB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG - select ADK_KPACKAGE_KMOD_MEDIA_SUPPORT - default n - help - -config ADK_KPACKAGE_KMOD_USB_GSPCA - prompt "kmod-usb-gspca................... GSPCA webcam framework" - depends on ADK_TARGET_WITH_USB - tristate - help - GSPCA webcam framework - -config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC207 - prompt "kmod-usb-gpsca-pac207............ Pixart PAC207 USB Camera Driver" - tristate - depends on ADK_KPACKAGE_KMOD_USB_GSPCA - help - -config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC7311 - prompt "kmod-usb-gpsca-pac7311........... Pixart PAC7311 USB Camera Driver" - tristate - depends on ADK_KPACKAGE_KMOD_USB_GSPCA - help - -config ADK_KPACKAGE_KMOD_USB_GSPCA_SPCA561 - prompt "kmod-usb-gpsca-spca561........... SPCA561 USB Camera Driver" - tristate - depends on ADK_KPACKAGE_KMOD_USB_GSPCA - help - -config ADK_KPACKAGE_KMOD_USB_PWC - prompt "kmod-usb-pwc..................... Kernel driver for USB Philips Cameras" - tristate - depends on ADK_KPACKAGE_KMOD_USB - default n - help - -endmenu -endmenu diff --git a/target/linux/config/Config.in.video b/target/linux/config/Config.in.video new file mode 100644 index 000000000..6182ea6cf --- /dev/null +++ b/target/linux/config/Config.in.video @@ -0,0 +1,64 @@ +config ADK_KERNEL_VIDEO_DEV + boolean + +config ADK_KERNEL_VIDEO_V4L2 + boolean + select ADK_KERNEL_VIDEO_DEV + +config ADK_KERNEL_MEDIA_USB_SUPPORT + boolean + +config ADK_KERNEL_MEDIA_CAMERA_SUPPORT + boolean + +menu "Video devices support" +config ADK_KPACKAGE_KMOD_MEDIA_SUPPORT + tristate + default n + help + +config ADK_KPACKAGE_KMOD_USB_VIDEO_CLASS + prompt "kmod-usb-video-class............ Kernel driver for USB video webcams" + tristate + depends on ADK_KPACKAGE_KMOD_USB || ADK_TARGET_SYSTEM_LEMOTE_YEELONG + select ADK_KPACKAGE_KMOD_MEDIA_SUPPORT + default n + help + +config ADK_KPACKAGE_KMOD_USB_GSPCA + prompt "kmod-usb-gspca................... GSPCA webcam framework" + depends on ADK_TARGET_WITH_USB + select ADK_KERNEL_VIDEO_V4L2 + select ADK_KPACKAGE_KMOD_MEDIA_SUPPORT + select ADK_KERNEL_MEDIA_USB_SUPPORT + select ADK_KERNEL_MEDIA_CAMERA_SUPPORT + tristate + help + GSPCA webcam framework + +config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC207 + prompt "kmod-usb-gpsca-pac207............ Pixart PAC207 USB Camera Driver" + tristate + depends on ADK_KPACKAGE_KMOD_USB_GSPCA + help + +config ADK_KPACKAGE_KMOD_USB_GSPCA_PAC7311 + prompt "kmod-usb-gpsca-pac7311........... Pixart PAC7311 USB Camera Driver" + tristate + depends on ADK_KPACKAGE_KMOD_USB_GSPCA + help + +config ADK_KPACKAGE_KMOD_USB_GSPCA_SPCA561 + prompt "kmod-usb-gpsca-spca561........... SPCA561 USB Camera Driver" + tristate + depends on ADK_KPACKAGE_KMOD_USB_GSPCA + help + +config ADK_KPACKAGE_KMOD_USB_PWC + prompt "kmod-usb-pwc..................... Kernel driver for USB Philips Cameras" + tristate + depends on ADK_TARGET_WITH_USB + default n + help + +endmenu -- cgit v1.2.3