X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fkernel%2Flinux%2Fmodules%2Fvideo.mk;h=7a7d80c534a4c049a1eaee051d5c97e64e9051ec;hp=cd9525857e87e231da393b356565fcdcf7330031;hb=13e7b6d77da41b47ccd7947d208b3d4eaea29b81;hpb=aa81b9ed5ff5f016bc6fcefd110ee524d9dc98fd diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk index cd9525857e..7a7d80c534 100644 --- a/package/kernel/linux/modules/video.mk +++ b/package/kernel/linux/modules/video.mk @@ -8,21 +8,17 @@ VIDEO_MENU:=Video Support -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1) V4L2_DIR=v4l2-core V4L2_USB_DIR=usb -else -V4L2_DIR=video -V4L2_USB_DIR=video -endif - define KernelPackage/fb SUBMENU:=$(VIDEO_MENU) TITLE:=Framebuffer support DEPENDS:=@DISPLAY_SUPPORT KCONFIG:=CONFIG_FB - FILES:=$(LINUX_DIR)/drivers/video/fb.ko + FILES:= \ + $(LINUX_DIR)/drivers/video/fb.ko@lt3.15 \ + $(LINUX_DIR)/drivers/video/fbdev/core/fb.ko@ge3.15 AUTOLOAD:=$(call AutoLoad,06,fb) endef @@ -42,7 +38,9 @@ define KernelPackage/fb-cfb-fillrect TITLE:=Framebuffer software rectangle filling support DEPENDS:=+kmod-fb KCONFIG:=CONFIG_FB_CFB_FILLRECT - FILES:=$(LINUX_DIR)/drivers/video/cfbfillrect.ko + FILES:= \ + $(LINUX_DIR)/drivers/video/cfbfillrect.ko@lt3.15 \ + $(LINUX_DIR)/drivers/video/fbdev/core/cfbfillrect.ko@ge3.15 AUTOLOAD:=$(call AutoLoad,07,cfbfillrect) endef @@ -58,7 +56,9 @@ define KernelPackage/fb-cfb-copyarea TITLE:=Framebuffer software copy area support DEPENDS:=+kmod-fb KCONFIG:=CONFIG_FB_CFB_COPYAREA - FILES:=$(LINUX_DIR)/drivers/video/cfbcopyarea.ko + FILES:= \ + $(LINUX_DIR)/drivers/video/cfbcopyarea.ko@lt3.15 \ + $(LINUX_DIR)/drivers/video/fbdev/core/cfbcopyarea.ko@ge3.15 AUTOLOAD:=$(call AutoLoad,07,cfbcopyarea) endef @@ -73,7 +73,9 @@ define KernelPackage/fb-cfb-imgblt TITLE:=Framebuffer software image blit support DEPENDS:=+kmod-fb KCONFIG:=CONFIG_FB_CFB_IMAGEBLIT - FILES:=$(LINUX_DIR)/drivers/video/cfbimgblt.ko + FILES:= \ + $(LINUX_DIR)/drivers/video/cfbimgblt.ko@lt3.15 \ + $(LINUX_DIR)/drivers/video/fbdev/core/cfbimgblt.ko@ge3.15 AUTOLOAD:=$(call AutoLoad,07,cfbimgblt) endef @@ -151,7 +153,7 @@ define KernelPackage/video-cpia2 DEPENDS:=@USB_SUPPORT +kmod-usb-core KCONFIG:=CONFIG_VIDEO_CPIA2 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/cpia2/cpia2.ko - AUTOLOAD:=$(call AutoLoad,70,cpia2) + AUTOLOAD:=$(call AutoProbe,cpia2) $(call AddDepends/camera) endef @@ -162,22 +164,6 @@ endef $(eval $(call KernelPackage,video-cpia2)) -define KernelPackage/video-sn9c102 - TITLE:=SN9C102 Camera Chip support - DEPENDS:=@USB_SUPPORT +kmod-usb-core - KCONFIG:=CONFIG_USB_SN9C102 - FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/sn9c102/sn9c102.ko - AUTOLOAD:=$(call AutoLoad,70,gspca_sn9c20x) - $(call AddDepends/camera) -endef - -define KernelPackage/video-sn9c102/description - Kernel modules for supporting SN9C102 camera chips -endef - -$(eval $(call KernelPackage,video-sn9c102)) - - define KernelPackage/video-pwc TITLE:=Philips USB webcam support DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-video-videobuf2 @@ -185,7 +171,7 @@ define KernelPackage/video-pwc CONFIG_USB_PWC \ CONFIG_USB_PWC_DEBUG=n FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/pwc/pwc.ko - AUTOLOAD:=$(call AutoLoad,70,pwc) + AUTOLOAD:=$(call AutoProbe,pwc) $(call AddDepends/camera) endef @@ -198,12 +184,11 @@ $(eval $(call KernelPackage,video-pwc)) define KernelPackage/video-uvc TITLE:=USB Video Class (UVC) support - DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-video-videobuf2 + DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-video-videobuf2 +kmod-input-core KCONFIG:= CONFIG_USB_VIDEO_CLASS FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/uvc/uvcvideo.ko - AUTOLOAD:=$(call AutoLoad,90,uvcvideo) + AUTOLOAD:=$(call AutoProbe,uvcvideo) $(call AddDepends/camera) - $(call AddDepends/input) endef define KernelPackage/video-uvc/description @@ -219,7 +204,7 @@ define KernelPackage/video-gspca-core DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-input-core KCONFIG:=CONFIG_USB_GSPCA FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_main.ko - AUTOLOAD:=$(call AutoLoad,70,gspca_main) + AUTOLOAD:=$(call AutoProbe,gspca_main) $(call AddDepends/camera) endef @@ -241,7 +226,7 @@ define KernelPackage/video-gspca-conex TITLE:=conex webcam support KCONFIG:=CONFIG_USB_GSPCA_CONEX FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_conex.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_conex) + AUTOLOAD:=$(call AutoProbe,gspca_conex) $(call AddDepends/camera-gspca) endef @@ -256,7 +241,7 @@ define KernelPackage/video-gspca-etoms TITLE:=etoms webcam support KCONFIG:=CONFIG_USB_GSPCA_ETOMS FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_etoms.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_etoms) + AUTOLOAD:=$(call AutoProbe,gspca_etoms) $(call AddDepends/camera-gspca) endef @@ -271,7 +256,7 @@ define KernelPackage/video-gspca-finepix TITLE:=finepix webcam support KCONFIG:=CONFIG_USB_GSPCA_FINEPIX FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_finepix.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_finepix) + AUTOLOAD:=$(call AutoProbe,gspca_finepix) $(call AddDepends/camera-gspca) endef @@ -286,7 +271,7 @@ define KernelPackage/video-gspca-mars TITLE:=mars webcam support KCONFIG:=CONFIG_USB_GSPCA_MARS FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_mars.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_mars) + AUTOLOAD:=$(call AutoProbe,gspca_mars) $(call AddDepends/camera-gspca) endef @@ -301,7 +286,7 @@ define KernelPackage/video-gspca-mr97310a TITLE:=mr97310a webcam support KCONFIG:=CONFIG_USB_GSPCA_MR97310A FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_mr97310a.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_mr97310a) + AUTOLOAD:=$(call AutoProbe,gspca_mr97310a) $(call AddDepends/camera-gspca) endef @@ -316,7 +301,7 @@ define KernelPackage/video-gspca-ov519 TITLE:=ov519 webcam support KCONFIG:=CONFIG_USB_GSPCA_OV519 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_ov519.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_ov519) + AUTOLOAD:=$(call AutoProbe,gspca_ov519) $(call AddDepends/camera-gspca) endef @@ -331,7 +316,7 @@ define KernelPackage/video-gspca-ov534 TITLE:=ov534 webcam support KCONFIG:=CONFIG_USB_GSPCA_OV534 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_ov534.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_ov534) + AUTOLOAD:=$(call AutoProbe,gspca_ov534) $(call AddDepends/camera-gspca) endef @@ -346,7 +331,7 @@ define KernelPackage/video-gspca-ov534-9 TITLE:=ov534-9 webcam support KCONFIG:=CONFIG_USB_GSPCA_OV534_9 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_ov534_9.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_ov534_9) + AUTOLOAD:=$(call AutoProbe,gspca_ov534_9) $(call AddDepends/camera-gspca) endef @@ -361,7 +346,7 @@ define KernelPackage/video-gspca-pac207 TITLE:=pac207 webcam support KCONFIG:=CONFIG_USB_GSPCA_PAC207 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_pac207.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_pac207) + AUTOLOAD:=$(call AutoProbe,gspca_pac207) $(call AddDepends/camera-gspca) endef @@ -376,7 +361,7 @@ define KernelPackage/video-gspca-pac7311 TITLE:=pac7311 webcam support KCONFIG:=CONFIG_USB_GSPCA_PAC7311 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_pac7311.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_pac7311) + AUTOLOAD:=$(call AutoProbe,gspca_pac7311) $(call AddDepends/camera-gspca) endef @@ -391,7 +376,7 @@ define KernelPackage/video-gspca-se401 TITLE:=se401 webcam support KCONFIG:=CONFIG_USB_GSPCA_SE401 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_se401.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_se401) + AUTOLOAD:=$(call AutoProbe,gspca_se401) $(call AddDepends/camera-gspca) endef @@ -406,7 +391,7 @@ define KernelPackage/video-gspca-sn9c20x TITLE:=sn9c20x webcam support KCONFIG:=CONFIG_USB_GSPCA_SN9C20X FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sn9c20x.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_sn9c20x) + AUTOLOAD:=$(call AutoProbe,gspca_sn9c20x) $(call AddDepends/camera-gspca) endef @@ -421,7 +406,7 @@ define KernelPackage/video-gspca-sonixb TITLE:=sonixb webcam support KCONFIG:=CONFIG_USB_GSPCA_SONIXB FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sonixb.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_sonixb) + AUTOLOAD:=$(call AutoProbe,gspca_sonixb) $(call AddDepends/camera-gspca) endef @@ -436,7 +421,7 @@ define KernelPackage/video-gspca-sonixj TITLE:=sonixj webcam support KCONFIG:=CONFIG_USB_GSPCA_SONIXJ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sonixj.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_sonixj) + AUTOLOAD:=$(call AutoProbe,gspca_sonixj) $(call AddDepends/camera-gspca) endef @@ -451,7 +436,7 @@ define KernelPackage/video-gspca-spca500 TITLE:=spca500 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA500 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca500.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_spca500) + AUTOLOAD:=$(call AutoProbe,gspca_spca500) $(call AddDepends/camera-gspca) endef @@ -466,7 +451,7 @@ define KernelPackage/video-gspca-spca501 TITLE:=spca501 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA501 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca501.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_spca501) + AUTOLOAD:=$(call AutoProbe,gspca_spca501) $(call AddDepends/camera-gspca) endef @@ -481,7 +466,7 @@ define KernelPackage/video-gspca-spca505 TITLE:=spca505 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA505 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca505.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_spca505) + AUTOLOAD:=$(call AutoProbe,gspca_spca505) $(call AddDepends/camera-gspca) endef @@ -496,7 +481,7 @@ define KernelPackage/video-gspca-spca506 TITLE:=spca506 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA506 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca506.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_spca506) + AUTOLOAD:=$(call AutoProbe,gspca_spca506) $(call AddDepends/camera-gspca) endef @@ -511,7 +496,7 @@ define KernelPackage/video-gspca-spca508 TITLE:=spca508 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA508 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca508.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_spca508) + AUTOLOAD:=$(call AutoProbe,gspca_spca508) $(call AddDepends/camera-gspca) endef @@ -526,7 +511,7 @@ define KernelPackage/video-gspca-spca561 TITLE:=spca561 webcam support KCONFIG:=CONFIG_USB_GSPCA_SPCA561 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca561.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_spca561) + AUTOLOAD:=$(call AutoProbe,gspca_spca561) $(call AddDepends/camera-gspca) endef @@ -541,7 +526,7 @@ define KernelPackage/video-gspca-sq905 TITLE:=sq905 webcam support KCONFIG:=CONFIG_USB_GSPCA_SQ905 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sq905.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_sq905) + AUTOLOAD:=$(call AutoProbe,gspca_sq905) $(call AddDepends/camera-gspca) endef @@ -556,7 +541,7 @@ define KernelPackage/video-gspca-sq905c TITLE:=sq905c webcam support KCONFIG:=CONFIG_USB_GSPCA_SQ905C FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sq905c.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_sq905c) + AUTOLOAD:=$(call AutoProbe,gspca_sq905c) $(call AddDepends/camera-gspca) endef @@ -571,7 +556,7 @@ define KernelPackage/video-gspca-stk014 TITLE:=stk014 webcam support KCONFIG:=CONFIG_USB_GSPCA_STK014 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_stk014.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_stk014) + AUTOLOAD:=$(call AutoProbe,gspca_stk014) $(call AddDepends/camera-gspca) endef @@ -586,7 +571,7 @@ define KernelPackage/video-gspca-sunplus TITLE:=sunplus webcam support KCONFIG:=CONFIG_USB_GSPCA_SUNPLUS FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sunplus.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_sunplus) + AUTOLOAD:=$(call AutoProbe,gspca_sunplus) $(call AddDepends/camera-gspca) endef @@ -601,7 +586,7 @@ define KernelPackage/video-gspca-t613 TITLE:=t613 webcam support KCONFIG:=CONFIG_USB_GSPCA_T613 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_t613.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_t613) + AUTOLOAD:=$(call AutoProbe,gspca_t613) $(call AddDepends/camera-gspca) endef @@ -616,7 +601,7 @@ define KernelPackage/video-gspca-tv8532 TITLE:=tv8532 webcam support KCONFIG:=CONFIG_USB_GSPCA_TV8532 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_tv8532.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_tv8532) + AUTOLOAD:=$(call AutoProbe,gspca_tv8532) $(call AddDepends/camera-gspca) endef @@ -631,7 +616,7 @@ define KernelPackage/video-gspca-vc032x TITLE:=vc032x webcam support KCONFIG:=CONFIG_USB_GSPCA_VC032X FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_vc032x.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_vc032x) + AUTOLOAD:=$(call AutoProbe,gspca_vc032x) $(call AddDepends/camera-gspca) endef @@ -646,7 +631,7 @@ define KernelPackage/video-gspca-zc3xx TITLE:=zc3xx webcam support KCONFIG:=CONFIG_USB_GSPCA_ZC3XX FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_zc3xx.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_zc3xx) + AUTOLOAD:=$(call AutoProbe,gspca_zc3xx) $(call AddDepends/camera-gspca) endef @@ -661,7 +646,7 @@ define KernelPackage/video-gspca-m5602 TITLE:=m5602 webcam support KCONFIG:=CONFIG_USB_M5602 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/m5602/gspca_m5602.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_m5602) + AUTOLOAD:=$(call AutoProbe,gspca_m5602) $(call AddDepends/camera-gspca) endef @@ -676,7 +661,7 @@ define KernelPackage/video-gspca-stv06xx TITLE:=stv06xx webcam support KCONFIG:=CONFIG_USB_STV06XX FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/stv06xx/gspca_stv06xx.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_stv06xx) + AUTOLOAD:=$(call AutoProbe,gspca_stv06xx) $(call AddDepends/camera-gspca) endef @@ -691,7 +676,7 @@ define KernelPackage/video-gspca-gl860 TITLE:=gl860 webcam support KCONFIG:=CONFIG_USB_GL860 FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gl860/gspca_gl860.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_gl860) + AUTOLOAD:=$(call AutoProbe,gspca_gl860) $(call AddDepends/camera-gspca) endef @@ -706,7 +691,7 @@ define KernelPackage/video-gspca-jeilinj TITLE:=jeilinj webcam support KCONFIG:=CONFIG_USB_GSPCA_JEILINJ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_jeilinj.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_jeilinj) + AUTOLOAD:=$(call AutoProbe,gspca_jeilinj) $(call AddDepends/camera-gspca) endef @@ -721,7 +706,7 @@ define KernelPackage/video-gspca-konica TITLE:=konica webcam support KCONFIG:=CONFIG_USB_GSPCA_KONICA FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_konica.ko - AUTOLOAD:=$(call AutoLoad,75,gspca_konica) + AUTOLOAD:=$(call AutoProbe,gspca_konica) $(call AddDepends/camera-gspca) endef