X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fother.mk;h=79ec19084385743250cd350d392c0bc63dc009fe;hp=8499c461f90c5569507cf07603a88e0881a2fa90;hb=e389d9c59f7899dde658a41d0675912726beeb7d;hpb=44aa0b5dacb80243009b349a5cd5ef40e6dd2103 diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 8499c461f9..79ec190843 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -4,7 +4,6 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ OTHER_MENU:=Other modules @@ -72,7 +71,11 @@ define KernelPackage/eeprom-93cx6 TITLE:=EEPROM 93CX6 support DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_EEPROM_93CX6 +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1) + FILES:=$(LINUX_DIR)/drivers/misc/eeprom/eeprom_93cx6.$(LINUX_KMOD_SUFFIX) +else FILES:=$(LINUX_DIR)/drivers/misc/eeprom_93cx6.$(LINUX_KMOD_SUFFIX) +endif AUTOLOAD:=$(call AutoLoad,20,eeprom_93cx6) endef @@ -210,10 +213,11 @@ $(eval $(call KernelPackage,pcmcia-serial)) define KernelPackage/ssb SUBMENU:=$(OTHER_MENU) TITLE:=Silicon Sonics Backplane glue code - DEPENDS:=@LINUX_2_6 @PCI_SUPPORT @!TARGET_brcm47xx + DEPENDS:=@LINUX_2_6 @PCI_SUPPORT @!TARGET_brcm47xx||!TARGET_brcm63xx KCONFIG:=\ CONFIG_SSB \ CONFIG_SSB_B43_PCI_BRIDGE=y \ + CONFIG_SSB_DRIVER_MIPS=n \ CONFIG_SSB_DRIVER_PCICORE=y \ CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y \ CONFIG_SSB_PCIHOST=y \ @@ -235,7 +239,26 @@ $(eval $(call KernelPackage,ssb)) define KernelPackage/bluetooth SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support - DEPENDS:=@USB_SUPPORT +kmod-usb-core + DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-input-core +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1) + KCONFIG:= \ + CONFIG_BLUEZ \ + CONFIG_BLUEZ_L2CAP \ + CONFIG_BLUEZ_SCO \ + CONFIG_BLUEZ_RFCOMM \ + CONFIG_BLUEZ_BNEP \ + CONFIG_BLUEZ_HCIUART \ + CONFIG_BLUEZ_HCIUSB \ + CONFIG_BLUEZ_HIDP \ + CONFIG_BT \ + CONFIG_BT_L2CAP \ + CONFIG_BT_SCO \ + CONFIG_BT_RFCOMM \ + CONFIG_BT_BNEP \ + CONFIG_BT_HCIBTUSB \ + CONFIG_BT_HCIUART \ + CONFIG_BT_HIDP +else KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ @@ -244,13 +267,16 @@ define KernelPackage/bluetooth CONFIG_BLUEZ_BNEP \ CONFIG_BLUEZ_HCIUART \ CONFIG_BLUEZ_HCIUSB \ + CONFIG_BLUEZ_HIDP \ CONFIG_BT \ CONFIG_BT_L2CAP \ CONFIG_BT_SCO \ CONFIG_BT_RFCOMM \ CONFIG_BT_BNEP \ CONFIG_BT_HCIUSB \ - CONFIG_BT_HCIUART + CONFIG_BT_HCIUART \ + CONFIG_BT_HIDP +endif endef define KernelPackage/bluetooth/2.4 @@ -282,15 +308,29 @@ define KernelPackage/bluetooth/2.6 # CONFIG_BT_BNEP \ # CONFIG_BT_HCIUSB \ # CONFIG_BT_HCIUART +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1) FILES:= \ $(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/hidp/hidp.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/bluetooth/btusb.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart btusb) +else + FILES:= \ + $(LINUX_DIR)/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/bluetooth/hidp/hidp.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hci_uart hci_usb) + AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart hci_usb) +endif endef define KernelPackage/bluetooth/description @@ -592,7 +632,7 @@ $(eval $(call KernelPackage,input-core)) define KernelPackage/input-evdev SUBMENU:=$(OTHER_MENU) - TITLE:=Input even device + TITLE:=Input event device DEPENDS:=+kmod-input-core KCONFIG:=CONFIG_INPUT_EVDEV FILES:=$(LINUX_DIR)/drivers/input/evdev.$(LINUX_KMOD_SUFFIX) @@ -608,7 +648,7 @@ $(eval $(call KernelPackage,input-evdev)) define KernelPackage/hid SUBMENU:=$(OTHER_MENU) - TITLE:=Input even device + TITLE:=HID Devices DEPENDS:=+kmod-input-core +kmod-input-evdev KCONFIG:=CONFIG_HID FILES:=$(LINUX_DIR)/drivers/hid/hid.$(LINUX_KMOD_SUFFIX) @@ -655,6 +695,21 @@ endef $(eval $(call KernelPackage,input-gpio-buttons)) +define KernelPackage/input-joydev + SUBMENU:=$(OTHER_MENU) + TITLE:=Joystick device support + DEPENDS:=+kmod-input-core + KCONFIG:=CONFIG_INPUT_JOYDEV + FILES:=$(LINUX_DIR)/drivers/input/joydev.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,62,joydev) +endef + +define KernelPackage/input-joydev/description + Kernel module for joystick support +endef + +$(eval $(call KernelPackage,input-joydev)) + define KernelPackage/mmc-spi SUBMENU:=$(OTHER_MENU) @@ -752,6 +807,21 @@ endef $(eval $(call KernelPackage,spi-dev)) +define KernelPackage/bcm63xx-spi + SUBMENU:=$(OTHER_MENU) + TITLE:=Broadcom BCM63xx SPI driver + DEPENDS:=@TARGET_brcm63xx +kmod-spi-bitbang + KCONFIG:=CONFIG_SPI_BCM63XX + FILES:=$(LINUX_DIR)/drivers/spi/bcm63xx_spi.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,92,bcm63xx_spi) +endef + +define KernelPackage/bcm63xx-spi/description + This package contains the Broadcom BCM63xx SPI Master driver +endef + +$(eval $(call KernelPackage,bcm63xx-spi)) + define KernelPackage/cs5535-gpio SUBMENU:=$(OTHER_MENU) TITLE:=AMD CS5535/CS5536 GPIO driver @@ -790,7 +860,7 @@ $(eval $(call KernelPackage,textsearch)) define KernelPackage/rfkill SUBMENU:=$(OTHER_MENU) TITLE:=RF switch subsystem support - DEPENDS:=@LINUX_2_6 @!LINUX_2_6_21 @!TARGET_rb532 @!TARGET_avr32 @!TARGET_brcm47xx @!TARGET_s3c24xx @!TARGET_ifxmips @!TARGET_atheros @!TARGET_adm5120 @!TARGET_ar7 @!TARGET_ppc40x @!TARGET_ixp4xx @!TARGET_rdc + DEPENDS:=@LINUX_2_6 @!LINUX_2_6_21 @!TARGET_rb532 @!TARGET_avr32 @!TARGET_brcm47xx @!TARGET_s3c24xx @!TARGET_ifxmips @!TARGET_atheros @!TARGET_adm5120 @!TARGET_ar7 @!TARGET_ppc40x @!TARGET_ixp4xx @!TARGET_rdc @!TARGET_uml KCONFIG:= \ CONFIG_RFKILL \ CONFIG_RFKILL_INPUT \ @@ -808,3 +878,39 @@ endef $(eval $(call KernelPackage,rfkill)) + +define KernelPackage/rtc-core + SUBMENU:=$(OTHER_MENU) + TITLE:=Kernel support for RTC devices + DEPENDS:=@LINUX_2_6 + KCONFIG:= \ + CONFIG_RTC_CLASS \ + CONFIG_RTC_LIB + CONFIG_RTC_HCTOSYS=y \ + CONFIG_RTC_HCTOSYS_DEVICE=rtc0 + FILES:= \ + $(LINUX_DIR)/drivers/rtc/rtc-core.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/rtc/rtc-lib.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,30,rtc-lib rtc-core) +endef + +define KernelPackage/rtc-core/description + Kernel module for the RTC devices. +endef + +$(eval $(call KernelPackage,rtc-core)) + +define KernelPackage/rtc-m48t86 + SUBMENU:=$(OTHER_MENU) + TITLE:=RTC M48T86 / Dallas DS12887 + DEPENDS:=+kmod-rtc-core + KCONFIG:=CONFIG_RTC_DRV_M48T86 + FILES:=$(LINUX_DIR)/drivers/rtc/rtc-m48t86.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,31,rtc-m48t86) +endef + +define KernelPackage/rtc-m48t86/description + Kernel support for the RTC device M48T86 / Dallas DS12887 +endef + +$(eval $(call KernelPackage,rtc-m48t86))