X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fother.mk;h=309e25b929eb0f644be507742e95f829ac22521a;hb=757f523019dd61e625d909fd5b5698e6844870ca;hp=3bbf3a37d22ec782c4b5e5e9bbeb91e2ab423f37;hpb=209c18d4399845dbe6d277355de070a83f54c31f;p=openwrt.git diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 3bbf3a37d2..309e25b929 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -1,10 +1,9 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ OTHER_MENU:=Other modules @@ -52,12 +51,31 @@ endef $(eval $(call KernelPackage,crc7)) +define KernelPackage/crc16 + SUBMENU:=$(OTHER_MENU) + TITLE:=CRC16 support + KCONFIG:=CONFIG_CRC16 + FILES:=$(LINUX_DIR)/lib/crc16.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,20,crc16) +endef + +define KernelPackage/crc16/description + Kernel module for CRC16 support +endef + +$(eval $(call KernelPackage,crc16)) + + define KernelPackage/eeprom-93cx6 SUBMENU:=$(OTHER_MENU) 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 @@ -85,6 +103,23 @@ endef $(eval $(call KernelPackage,lp)) +define KernelPackage/pcspkr + SUBMENU:=$(OTHER_MENU) + TITLE:=PC speaker support + DEPENDS:=@LINUX_2_6 + KCONFIG:=CONFIG_INPUT_PCSPKR + FILES:= \ + $(LINUX_DIR)/drivers/input/misc/pcspkr.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,50, \ + pcspkr \ + ) +endef + +define KernelPackage/pcspkr/description + This enables sounds (tones) through the pc speaker +endef + +$(eval $(call KernelPackage,pcspkr)) define KernelPackage/pcmcia-core SUBMENU:=$(OTHER_MENU) @@ -94,7 +129,6 @@ define KernelPackage/pcmcia-core CONFIG_PCMCIA \ CONFIG_CARDBUS \ CONFIG_PCCARD \ - CONFIG_YENTA \ CONFIG_PCCARD_NONSTATIC \ PCMCIA_DEBUG=n endef @@ -106,21 +140,20 @@ define KernelPackage/pcmcia-core/2.4 FILES:= \ $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,40,pcmcia_core ds) + AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds) endef define KernelPackage/pcmcia-core/2.6 # KCONFIG:= \ # CONFIG_PCCARD \ # CONFIG_PCMCIA \ -# CONFIG_YENTA \ # CONFIG_PCCARD_NONSTATIC \ # PCMCIA_DEBUG=n FILES:= \ $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic) + AUTOLOAD:=$(call AutoLoad,25,pcmcia_core pcmcia rsrc_nonstatic) endef define KernelPackage/pcmcia-core/description @@ -195,10 +228,11 @@ $(eval $(call KernelPackage,pcmcia-serial)) define KernelPackage/ssb SUBMENU:=$(OTHER_MENU) TITLE:=Silicon Sonics Backplane glue code - DEPENDS:=@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 \ @@ -220,7 +254,7 @@ $(eval $(call KernelPackage,ssb)) define KernelPackage/bluetooth SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support - DEPENDS:=@USB_SUPPORT + DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-input-core KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ @@ -229,13 +263,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_HCIBTUSB \ CONFIG_BT_HCIUSB \ - CONFIG_BT_HCIUART + CONFIG_BT_HCIUART \ + CONFIG_BT_HIDP endef define KernelPackage/bluetooth/2.4 @@ -267,15 +304,29 @@ define KernelPackage/bluetooth/2.6 # CONFIG_BT_BNEP \ # CONFIG_BT_HCIUSB \ # CONFIG_BT_HCIUART +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.27)),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 @@ -404,7 +455,7 @@ $(eval $(call KernelPackage,ledtrig-adm5120-switch)) define KernelPackage/leds-net48xx SUBMENU:=$(OTHER_MENU) TITLE:=Soekris Net48xx LED support - DEPENDS:=@TARGET_x86 + DEPENDS:=@TARGET_x86 +kmod-scx200-gpio KCONFIG:=CONFIG_LEDS_NET48XX FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,leds-net48xx) @@ -420,7 +471,7 @@ $(eval $(call KernelPackage,leds-net48xx)) define KernelPackage/leds-wrap SUBMENU:=$(OTHER_MENU) TITLE:=PCengines WRAP LED support - DEPENDS:=@TARGET_x86 + DEPENDS:=@TARGET_x86 +kmod-scx200-gpio KCONFIG:=CONFIG_LEDS_WRAP FILES:=$(LINUX_DIR)/drivers/leds/leds-wrap.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,leds-wrap) @@ -514,7 +565,7 @@ $(eval $(call KernelPackage,nsc-gpio)) define KernelPackage/scx200-gpio SUBMENU:=$(OTHER_MENU) TITLE:=Natsemi SCX200 GPIO support - DEPENDS:=@TARGET_x86 kmod-nsc-gpio + DEPENDS:=@TARGET_x86 +kmod-nsc-gpio KCONFIG:=CONFIG_SCx200_GPIO FILES:=$(LINUX_DIR)/drivers/char/scx200_gpio.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,scx200_gpio) @@ -531,7 +582,7 @@ define KernelPackage/scx200-wdt SUBMENU:=$(OTHER_MENU) TITLE:=Natsemi SCX200 Watchdog support DEPENDS:=@TARGET_x86 - KCONFIG:=CONFIG_SC1200_WDT + KCONFIG:=CONFIG_SCx200_WDT FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/scx200_wdt.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,scx200_wdt) endef @@ -565,7 +616,7 @@ define KernelPackage/input-core DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_INPUT FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,50,input-core) + AUTOLOAD:=$(call AutoLoad,19,input-core) endef define KernelPackage/input-core/description @@ -577,7 +628,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) @@ -593,7 +644,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) @@ -613,7 +664,7 @@ define KernelPackage/input-polldev DEPENDS:=+kmod-input-core @LINUX_2_6 KCONFIG:=CONFIG_INPUT_POLLDEV FILES:=$(LINUX_DIR)/drivers/input/input-polldev.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,61,input-polldev) + AUTOLOAD:=$(call AutoLoad,20,input-polldev) endef define KernelPackage/input-polldev/description @@ -640,23 +691,21 @@ endef $(eval $(call KernelPackage,input-gpio-buttons)) - -define KernelPackage/mmc-spi +define KernelPackage/input-joydev SUBMENU:=$(OTHER_MENU) - TITLE:=MMC/SD over SPI Support - DEPENDS:=@LINUX_2_6 +kmod-mmc +kmod-crc-itu-t +kmod-crc7 - KCONFIG:=CONFIG_MMC_SPI \ - CONFIG_SPI=y \ - CONFIG_SPI_MASTER=y - FILES:=$(LINUX_DIR)/drivers/mmc/host/mmc_spi.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,90,mmc_spi) + 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/mmc-spi/description - Kernel support for MMC/SD over SPI +define KernelPackage/input-joydev/description + Kernel module for joystick support endef -$(eval $(call KernelPackage,mmc-spi)) +$(eval $(call KernelPackage,input-joydev)) + define KernelPackage/mmc-atmelmci SUBMENU:=$(OTHER_MENU) @@ -673,66 +722,59 @@ endef $(eval $(call KernelPackage,mmc-atmelmci)) -define KernelPackage/spi-bitbang - SUBMENU:=$(OTHER_MENU) - TITLE:=Serial Peripheral Interface bitbanging library - DEPENDS:=@LINUX_2_6 - KCONFIG:=CONFIG_SPI_BITBANG \ - CONFIG_SPI=y \ - CONFIG_SPI_MASTER=y - FILES:=$(LINUX_DIR)/drivers/spi/spi_bitbang.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,91,spi_bitbang) -endef - -define KernelPackage/spi-bitbang/description - This package contains the SPI bitbanging library -endef - -$(eval $(call KernelPackage,spi-bitbang)) -define KernelPackage/spi-gpio +define KernelPackage/cs5535-gpio SUBMENU:=$(OTHER_MENU) - TITLE:=GPIO based bitbanging SPI controller - DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang - KCONFIG:=CONFIG_SPI_GPIO - FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,92,spi_gpio) + TITLE:=AMD CS5535/CS5536 GPIO driver + DEPENDS:=@TARGET_x86||@TARGET_olpc + KCONFIG:=CONFIG_CS5535_GPIO + FILES:=$(LINUX_DIR)/drivers/char/cs5535_gpio.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,90,cs5535_gpio) endef -define KernelPackage/spi-gpio/description - This package contains the GPIO based bitbanging SPI controller driver +define KernelPackage/cs5535-gpio/description + This package contains the AMD CS5535/CS5536 GPIO driver endef -$(eval $(call KernelPackage,spi-gpio)) +$(eval $(call KernelPackage,cs5535-gpio)) -define KernelPackage/spi-dev - SUBMENU:=$(OTHER_MENU) - TITLE:=User mode SPI device driver - DEPENDS:=@LINUX_2_6 - KCONFIG:=CONFIG_SPI_SPIDEV \ - CONFIG_SPI=y \ - CONFIG_SPI_MASTER=y - FILES:=$(LINUX_DIR)/drivers/spi/spidev.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,91,spidev) -endef -define KernelPackage/spi-dev/description - This package contains the user mode SPI device driver +define KernelPackage/textsearch +SUBMENU:=$(OTHER_MENU) + TITLE:=Textsearch support is selected if needed + DEPENDS:=@LINUX_2_6 @!LINUX_2_6_21 + KCONFIG:= \ + CONFIG_TEXTSEARCH=y \ + CONFIG_TEXTSEARCH_KMP \ + CONFIG_TEXTSEARCH_BM \ + CONFIG_TEXTSEARCH_FSM + FILES:= \ + $(LINUX_DIR)/lib/ts_kmp.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/lib/ts_bm.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/lib/ts_fsm.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,20,ts_kmp ts_bm ts_fsm) endef -$(eval $(call KernelPackage,spi-dev)) +$(eval $(call KernelPackage,textsearch)) -define KernelPackage/cs5535-gpio + +define KernelPackage/rfkill SUBMENU:=$(OTHER_MENU) - TITLE:=AMD CS5535/CS5536 GPIO driver - DEPENDS:=@TARGET_x86||@TARGET_olpc - KCONFIG:=CONFIG_CS5535_GPIO - FILES:=$(LINUX_DIR)/drivers/char/cs5535_gpio.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,90,cs5535_gpio) + 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 @!TARGET_uml + KCONFIG:= \ + CONFIG_RFKILL \ + CONFIG_RFKILL_INPUT \ + CONFIG_RFKILL_LEDS=y + FILES:= \ + $(LINUX_DIR)/net/rfkill/rfkill.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/net/rfkill/rfkill-input.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,20,rfkill rfkill-input) endef -define KernelPackage/cs5535-gpio/description - This package contains the AMD CS5535/CS5536 GPIO driver +define KernelPackage/rfkill/description + Say Y here if you want to have control over RF switches + found on many WiFi and Bluetooth cards. endef -$(eval $(call KernelPackage,cs5535-gpio)) +$(eval $(call KernelPackage,rfkill))