X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Flinux%2Fmodules%2Fvideo.mk;h=fb85f23223f817af50987afbcb91f64cf07afd60;hb=HEAD;hp=8ec444dcedda07f73ec731956ffa0deea4a100f7;hpb=ebb5ad0703bea89d7877e8e87e30cc3705039487;p=openwrt.git

diff --git a/package/kernel/linux/modules/video.mk b/package/kernel/linux/modules/video.mk
index 8ec444dced..fb85f23223 100644
--- a/package/kernel/linux/modules/video.mk
+++ b/package/kernel/linux/modules/video.mk
@@ -18,13 +18,15 @@ V4L2_USB_DIR=usb
 define KernelPackage/backlight
 	SUBMENU:=$(VIDEO_MENU)
 	TITLE:=Backlight support
-	KCONFIG:=CONFIG_BACKLIGHT_CLASS_DEVICE=m \
+	DEPENDS:=@DISPLAY_SUPPORT
+	HIDDEN:=1
+	KCONFIG:=CONFIG_BACKLIGHT_CLASS_DEVICE \
 		CONFIG_BACKLIGHT_LCD_SUPPORT=y \
 		CONFIG_LCD_CLASS_DEVICE=n \
-		CONFIG_BACKLIGHT_PWM=n \
 		CONFIG_BACKLIGHT_GENERIC=n \
 		CONFIG_BACKLIGHT_ADP8860=n \
 		CONFIG_BACKLIGHT_ADP8870=n \
+		CONFIG_BACKLIGHT_OT200=n \
 		CONFIG_BACKLIGHT_PM8941_WLED=n
 	FILES:=$(LINUX_DIR)/drivers/video/backlight/backlight.ko
 	AUTOLOAD:=$(call AutoProbe,video backlight)
@@ -36,18 +38,13 @@ endef
 
 $(eval $(call KernelPackage,backlight))
 
-define AddDepends/backlight
-	SUBMENU:=$(VIDEO_MENU)
-	DEPENDS+=kmod-backlight $(1)
-endef
-
 define KernelPackage/backlight-pwm
+	SUBMENU:=$(VIDEO_MENU)
 	TITLE:=PWM Backlight support
-	DEPENDS:=+kmod-pwm
-	KCONFIG:=CONFIG_BACKLIGHT_PWM=m
+	DEPENDS:=+kmod-backlight
+	KCONFIG:=CONFIG_BACKLIGHT_PWM
 	FILES:=$(LINUX_DIR)/drivers/video/backlight/pwm_bl.ko
 	AUTOLOAD:=$(call AutoProbe,video pwm_bl)
-	$(call AddDepends/backlight)
 endef
 
 define KernelPackage/backlight/backlight-pwm
@@ -105,7 +102,6 @@ define KernelPackage/fbcon
 	CONFIG_CONSOLE_TRANSLATIONS=y \
 	CONFIG_VT_CONSOLE=y \
 	CONFIG_VT_HW_CONSOLE_BINDING=y
-  $(call AddDepends/fb)
   FILES:= \
 	$(LINUX_DIR)/drivers/video/console/bitblit.ko \
 	$(LINUX_DIR)/drivers/video/console/softcursor.ko \
@@ -155,10 +151,6 @@ endef
 
 $(eval $(call KernelPackage,fb-cfb-copyarea))
 
-define AddDepends/fb-cfb-copyarea
-  DEPENDS+=kmod-fb-cfb-copyarea $(1)
-endef
-
 define KernelPackage/fb-cfb-imgblt
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=Framebuffer software image blit support
@@ -174,10 +166,6 @@ endef
 
 $(eval $(call KernelPackage,fb-cfb-imgblt))
 
-define AddDepends/fb-cfb-imgblt
-  DEPENDS+=kmod-fb-cfb-imgblt $(1)
-endef
-
 
 define KernelPackage/fb-sys-fops
   SUBMENU:=$(VIDEO_MENU)
@@ -194,14 +182,10 @@ endef
 
 $(eval $(call KernelPackage,fb-sys-fops))
 
-define AddDepends/fb-sys-fops
-  DEPENDS+=kmod-fb-sys-fops $(1)
-endef
-
-
 define KernelPackage/drm
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=Direct Rendering Manager (DRM) support
+  HIDDEN:=1
   DEPENDS:=+kmod-dma-buf
   KCONFIG:=CONFIG_DRM \
 	CONFIG_DRM_FBDEV_EMULATION=n \
@@ -246,17 +230,13 @@ endef
 
 $(eval $(call KernelPackage,drm))
 
-define AddDepends/drm
-  DEPENDS+=kmod-drm $(1)
-endef
-
 define KernelPackage/drm-imx
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=Freescale i.MX DRM support
-  DEPENDS:=@TARGET_imx6 +kmod-fb +kmod-fb-cfb-copyarea +kmod-fb-cfb-imgblt +kmod-fb-cfb-fillrect +kmod-fb-sys-fops
-  KCONFIG:=CONFIG_DRM_IMX=m \
+  DEPENDS:=@TARGET_imx6 +kmod-drm +kmod-fb +kmod-fb-cfb-copyarea +kmod-fb-cfb-imgblt +kmod-fb-cfb-fillrect +kmod-fb-sys-fops
+  KCONFIG:=CONFIG_DRM_IMX \
 	CONFIG_DRM_FBDEV_EMULATION=y \
-	CONFIG_IMX_IPUV3_CORE=m \
+	CONFIG_IMX_IPUV3_CORE \
 	CONFIG_RESET_CONTROLLER=y \
 	CONFIG_DRM_IMX_IPUV3 \
 	CONFIG_IMX_IPUV3 \
@@ -281,7 +261,6 @@ define KernelPackage/drm-imx
 	$(LINUX_DIR)/drivers/video/fbdev/core/sysimgblt.ko \
 	$(LINUX_DIR)/drivers/gpu/drm/drm_kms_helper.ko
   AUTOLOAD:=$(call AutoLoad,05,imxdrm imx-ipu-v3 imx-ipuv3-crtc)
-  $(call AddDepends/drm)
 endef
 
 define KernelPackage/drm-imx/description
@@ -290,22 +269,17 @@ endef
 
 $(eval $(call KernelPackage,drm-imx))
 
-define AddDepends/drm-imx
-  DEPENDS+=kmod-drm-imx $(1)
-endef
-
 define KernelPackage/drm-imx-hdmi
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=Freescale i.MX HDMI DRM support
-  DEPENDS:=+kmod-sound-core
-  KCONFIG:=CONFIG_DRM_IMX_HDMI=m \
-	CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
+  DEPENDS:=+kmod-sound-core kmod-drm-imx
+  KCONFIG:=CONFIG_DRM_IMX_HDMI \
+	CONFIG_DRM_DW_HDMI_AHB_AUDIO
   FILES:= \
 	$(LINUX_DIR)/drivers/gpu/drm/bridge/dw_hdmi.ko \
 	$(LINUX_DIR)/drivers/gpu/drm/bridge/dw_hdmi-ahb-audio.ko \
 	$(LINUX_DIR)/drivers/gpu/drm/imx/dw_hdmi-imx.ko
   AUTOLOAD:=$(call AutoLoad,05,dw_hdmi dw_hdmi-ahb-audio.ko dw_hdmi-imx)
-  $(call AddDepends/drm-imx)
 endef
 
 define KernelPackage/drm-imx-hdmi/description
@@ -317,8 +291,8 @@ $(eval $(call KernelPackage,drm-imx-hdmi))
 define KernelPackage/drm-imx-ldb
   SUBMENU:=$(VIDEO_MENU)
   TITLE:=Freescale i.MX LVDS DRM support
-  DEPENDS:=+kmod-backlight
-  KCONFIG:=CONFIG_DRM_IMX_LDB=m \
+  DEPENDS:=+kmod-backlight kmod-drm-imx
+  KCONFIG:=CONFIG_DRM_IMX_LDB \
 	CONFIG_DRM_PANEL_SIMPLE \
 	CONFIG_DRM_PANEL=y \
 	CONFIG_DRM_PANEL_SAMSUNG_LD9040=n \
@@ -329,7 +303,6 @@ define KernelPackage/drm-imx-ldb
   FILES:=$(LINUX_DIR)/drivers/gpu/drm/imx/imx-ldb.ko \
 	$(LINUX_DIR)/drivers/gpu/drm/panel/panel-simple.ko
   AUTOLOAD:=$(call AutoLoad,05,imx-ldb)
-  $(call AddDepends/drm-imx)
 endef
 
 define KernelPackage/drm-imx-ldb/description
@@ -348,7 +321,7 @@ define KernelPackage/video-core
   TITLE=Video4Linux support
   DEPENDS:=@PCI_SUPPORT||USB_SUPPORT +PACKAGE_kmod-i2c-core:kmod-i2c-core
   KCONFIG:= \
-	CONFIG_MEDIA_SUPPORT=m \
+	CONFIG_MEDIA_SUPPORT \
 	CONFIG_MEDIA_CAMERA_SUPPORT=y \
 	CONFIG_VIDEO_DEV \
 	CONFIG_VIDEO_V4L1=y \
@@ -377,10 +350,9 @@ define AddDepends/video
 endef
 
 define AddDepends/camera
-  SUBMENU:=$(VIDEO_MENU)
+$(AddDepends/video)
   KCONFIG+=CONFIG_MEDIA_USB_SUPPORT=y \
 	 CONFIG_MEDIA_CAMERA_SUPPORT=y
-  DEPENDS+=kmod-video-core $(1)
 endef