package/kernel: use macros for hid & input

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21120 3c298f89-4303-0410-b956-a3cf2f4a3e73

4 files changed, 41 insertions, 11 deletions

diff --git a/package/kernel/modules/001-depends.mk b/package/kernel/modules/001-depends.mk
index 826734ec9b..5cb3412081 100644
--- a/package/kernel/modules/001-depends.mk
+++ b/package/kernel/modules/001-depends.mk
@@ -16,6 +16,25 @@ define AddDepends/crc16
 endef
 
 
+define SetDepends/hid
+  DEPENDS:= @!TARGET_x86
+endef
+
+define AddDepends/hid
+  DEPENDS+= +!TARGET_x86:kmod-hid
+
+endef
+
+
+define SetDepends/input
+  DEPENDS:= @!TARGET_x86
+endef
+
+define AddDepends/input
+  DEPENDS+= +!TARGET_x86:kmod-input-core
+endef
+
+
 define SetDepends/rfkill
   DEPENDS:= @(TARGET_ar71xx||TARGET_brcm47xx||TARGET_s3c24xx||TARGET_x86)
 endef
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index aaa7bf008e..fbaf7638da 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -262,7 +262,7 @@ $(eval $(call KernelPackage,ssb))
 define KernelPackage/bluetooth
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Bluetooth support
-  DEPENDS:=@USB_SUPPORT +kmod-usb-core +!TARGET_x86:kmod-hid
+  DEPENDS:=@USB_SUPPORT +kmod-usb-core
   KCONFIG:= \
 	CONFIG_BLUEZ \
 	CONFIG_BLUEZ_L2CAP \
@@ -282,6 +282,7 @@ define KernelPackage/bluetooth
 	CONFIG_BT_HCIUART \
 	CONFIG_BT_HIDP
   $(call AddDepends/crc16)
+  $(call AddDepends/hid)
   $(call AddDepends/rfkill)
 endef
 
@@ -654,10 +655,11 @@ $(eval $(call KernelPackage,sc520-wdt))
 define KernelPackage/input-core
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Input device core
-  DEPENDS:=@LINUX_2_6 @!TARGET_x86
+  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_INPUT
   FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,19,input-core)
+  $(call SetDepends/input)
 endef
 
 define KernelPackage/input-core/description
@@ -670,10 +672,10 @@ $(eval $(call KernelPackage,input-core))
 define KernelPackage/input-evdev
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Input event device
-  DEPENDS:=+!TARGET_x86:kmod-input-core
   KCONFIG:=CONFIG_INPUT_EVDEV
   FILES:=$(LINUX_DIR)/drivers/input/evdev.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,evdev)
+  $(call AddDepends/input)
 endef
 
 define KernelPackage/input-evdev/description
@@ -686,10 +688,12 @@ $(eval $(call KernelPackage,input-evdev))
 define KernelPackage/hid
   SUBMENU:=$(OTHER_MENU)
   TITLE:=HID Devices
-  DEPENDS:=+kmod-input-core +kmod-input-evdev @!TARGET_x86
+  DEPENDS:=+kmod-input-evdev
   KCONFIG:=CONFIG_HID
   FILES:=$(LINUX_DIR)/drivers/hid/hid.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,61,hid)
+  $(call SetDepends/hid)
+  $(call AddDepends/input)
 endef
 
 define KernelPackage/hid/description
@@ -702,10 +706,11 @@ $(eval $(call KernelPackage,hid))
 define KernelPackage/input-polldev
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Polled Input device support
-  DEPENDS:=+!TARGET_x86:kmod-input-core @LINUX_2_6
+  DEPENDS:=@LINUX_2_6
   KCONFIG:=CONFIG_INPUT_POLLDEV
   FILES:=$(LINUX_DIR)/drivers/input/input-polldev.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,input-polldev)
+  $(call AddDepends/input)
 endef
 
 define KernelPackage/input-polldev/description
@@ -718,10 +723,11 @@ $(eval $(call KernelPackage,input-polldev))
 define KernelPackage/input-gpio-keys
   SUBMENU:=$(OTHER_MENU)
   TITLE:=GPIO key support
-  DEPENDS:= @GPIO_SUPPORT +!TARGET_x86:kmod-input-core
+  DEPENDS:= @GPIO_SUPPORT
   KCONFIG:=CONFIG_KEYBOARD_GPIO
   FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,gpio_keys)
+  $(call AddDepends/input)
 endef
 
 define KernelPackage/input-gpio-keys/description
@@ -752,10 +758,10 @@ $(eval $(call KernelPackage,input-gpio-buttons))
 define KernelPackage/input-joydev
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Joystick device support
-  DEPENDS:=+!TARGET_x86:kmod-input-core
   KCONFIG:=CONFIG_INPUT_JOYDEV
   FILES:=$(LINUX_DIR)/drivers/input/joydev.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,62,joydev)
+  $(call AddDepends/input)
 endef
 
 define KernelPackage/input-joydev/description
diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index a3d1486346..5278e201f7 100644
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -10,7 +10,7 @@ SOUND_MENU:=Sound Support
 define KernelPackage/sound-core
   SUBMENU:=$(SOUND_MENU)
   TITLE:=Sound support
-  DEPENDS:=@AUDIO_SUPPORT +!TARGET_x86:kmod-input-core
+  DEPENDS:=@AUDIO_SUPPORT
   KCONFIG:= \
 	CONFIG_SOUND \
 	CONFIG_SND \
@@ -26,6 +26,7 @@ define KernelPackage/sound-core
 	CONFIG_SND_PCM_OSS \
 	CONFIG_SND_MIXER_OSS \
 	CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+  $(call AddDepends/input)
 endef
 
 define KernelPackage/sound-core/2.4
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index b6f8d8bdbe..044c16fcfe 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -814,11 +814,13 @@ $(eval $(call KernelPackage,usb-net-rndis))
 
 
 define KernelPackage/usb-hid
-$(call KernelPackage/usb/Depends,@LINUX_2_6 +!TARGET_x86:kmod-input-core +kmod-input-evdev +!TARGET_x86:kmod-hid)
+$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-evdev)
   TITLE:=Support for USB Human Input Devices
   KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID
   FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko
   AUTOLOAD:=$(call AutoLoad,70,usbhid)
+  $(call AddDepends/hid)
+  $(call AddDepends/input)
 endef
 
 
@@ -830,11 +832,12 @@ $(eval $(call KernelPackage,usb-hid))
 
 
 define KernelPackage/usb-yealink
-$(call KernelPackage/usb/Depends,@LINUX_2_6 +!TARGET_x86:kmod-input-core +kmod-input-evdev)
+$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-evdev)
   TITLE:=USB Yealink VOIP phone
   KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y
   FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko
   AUTOLOAD:=$(call AutoLoad,70,yealink)
+  $(call AddDepends/input)
 endef
 
 define KernelPackage/usb-yealink/description
@@ -845,11 +848,12 @@ $(eval $(call KernelPackage,usb-yealink))
 
 
 define KernelPackage/usb-cm109
-$(call KernelPackage/usb/Depends,@LINUX_2_6 +!TARGET_x86:kmod-input-core +kmod-input-evdev)
+$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-evdev)
   TITLE:=Support for CM109 device
   KCONFIG:=CONFIG_USB_CM109 CONFIG_INPUT_CM109 CONFIG_INPUT=m CONFIG_INPUT_MISC=y
   FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/cm109.ko
   AUTOLOAD:=$(call AutoLoad,70,cm109)
+  $(call AddDepends/input)
 endef
 
 define KernelPackage/usb-cm109/description