X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fother.mk;h=47fee9f53c0a21dda7114389cbffcb0fb268f7c6;hb=c272d54969db96727ed9fa6a8a88a6aa061623e5;hp=87e92b951925fdc8483f960980c71879eb7da1e3;hpb=07926f29f62e997204fddd8c1cc5ab0dc7cedf7d;p=openwrt%2Fopenwrt.git diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 87e92b9519..47fee9f53c 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 @@ -72,7 +71,7 @@ define KernelPackage/eeprom-93cx6 TITLE:=EEPROM 93CX6 support DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_EEPROM_93CX6 - FILES:=$(LINUX_DIR)/drivers/misc/eeprom_93cx6.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/misc/eeprom/eeprom_93cx6.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,eeprom_93cx6) endef @@ -100,6 +99,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) @@ -109,7 +125,6 @@ define KernelPackage/pcmcia-core CONFIG_PCMCIA \ CONFIG_CARDBUS \ CONFIG_PCCARD \ - CONFIG_YENTA \ CONFIG_PCCARD_NONSTATIC \ PCMCIA_DEBUG=n endef @@ -121,21 +136,19 @@ 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) + $(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,25,pcmcia_core pcmcia) endef define KernelPackage/pcmcia-core/description @@ -150,8 +163,10 @@ define KernelPackage/pcmcia-yenta TITLE:=yenta socket driver DEPENDS:=kmod-pcmcia-core KCONFIG:=CONFIG_YENTA - FILES:=$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,41,yenta_socket) + FILES:= \ + $(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,41,rsrc_nonstatic yenta_socket) endef $(eval $(call KernelPackage,pcmcia-yenta)) @@ -210,10 +225,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 +251,7 @@ $(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-hid KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ @@ -244,13 +260,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 @@ -288,9 +307,10 @@ define KernelPackage/bluetooth/2.6 $(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) + $(LINUX_DIR)/drivers/bluetooth/btusb.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,90,bluetooth l2cap sco rfcomm bnep hidp hci_uart btusb) endef define KernelPackage/bluetooth/description @@ -347,10 +367,7 @@ $(eval $(call KernelPackage,mmc-at91)) ifeq ($(KERNEL),2.4) WATCHDOG_DIR=char endif -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.24)),1) - WATCHDOG_DIR=watchdog -endif -WATCHDOG_DIR?=char/watchdog +WATCHDOG_DIR?=watchdog define KernelPackage/atmel-wdt SUBMENU:=$(OTHER_MENU) @@ -382,6 +399,21 @@ endef $(eval $(call KernelPackage,softdog)) +define KernelPackage/rdc321x-wdt + SUBMENU:=$(OTHER_MENU) + TITLE:=RDC321x watchdog + DEPENDS:=@TARGET_rdc + KCONFIG:=CONFIG_RDC321X_WDT + FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/rdc321x_wdt.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,50,rdc321x_wdt) +endef + +define KernelPackage/rdc321x-wdt/description + RDC-321x watchdog driver +endef + +$(eval $(call KernelPackage,rdc321x-wdt)) + define KernelPackage/leds-gpio SUBMENU:=$(OTHER_MENU) @@ -452,9 +484,9 @@ define KernelPackage/leds-alix SUBMENU:=$(OTHER_MENU) TITLE:=PCengines ALIX LED support DEPENDS:=@TARGET_x86 - KCONFIG:=CONFIG_LEDS_ALIX - FILES:=$(LINUX_DIR)/drivers/leds/leds-alix.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,50,leds-alix) + KCONFIG:=CONFIG_LEDS_ALIX2 + FILES:=$(LINUX_DIR)/drivers/leds/leds-alix2.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,50,leds-alix2) endef define KernelPackage/leds-alix/description @@ -464,6 +496,22 @@ endef $(eval $(call KernelPackage,leds-alix)) +define KernelPackage/leds-wndr3700-usb + SUBMENU:=$(OTHER_MENU) + TITLE:=WNDR3700 USB LED support + DEPENDS:= @TARGET_ar71xx + KCONFIG:=CONFIG_LEDS_WNDR3700_USB + FILES:=$(LINUX_DIR)/drivers/leds/leds-wndr3700-usb.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,60,leds-wndr3700-usb) +endef + +define KernelPackage/leds-wndr3700-usb/description + Kernel module for the USB LED on the NETGWR WNDR3700 board. +endef + +$(eval $(call KernelPackage,leds-wndr3700-usb)) + + define KernelPackage/ledtrig-netdev SUBMENU:=$(OTHER_MENU) TITLE:=LED NETDEV Trigger @@ -580,7 +628,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 @@ -592,7 +640,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 +656,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) @@ -628,7 +676,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 @@ -638,6 +686,23 @@ endef $(eval $(call KernelPackage,input-polldev)) +define KernelPackage/input-gpio-keys + SUBMENU:=$(OTHER_MENU) + TITLE:=GPIO key support + DEPENDS:= @GPIO_SUPPORT +kmod-input-core + KCONFIG:=CONFIG_KEYBOARD_GPIO + FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,60,gpio_keys) +endef + +define KernelPackage/input-gpio-keys/description + This driver implements support for buttons connected + to GPIO pins of various CPUs (and some other chips). +endef + +$(eval $(call KernelPackage,input-gpio-keys)) + + define KernelPackage/input-gpio-buttons SUBMENU:=$(OTHER_MENU) TITLE:=Polled GPIO buttons input device @@ -655,23 +720,38 @@ 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/mmc-spi +define KernelPackage/input-joydev/description + Kernel module for joystick support +endef + +$(eval $(call KernelPackage,input-joydev)) + +define KernelPackage/input-rb532 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:=RB532 button device support + DEPENDS:=+kmod-input-core @TARGET_rb532 + KCONFIG:= \ + CONFIG_INPUT_MISC=y \ + CONFIG_INPUT_RB532_BUTTON + FILES:=$(LINUX_DIR)/drivers/input/misc/rb532_button.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,62,rb532_button) endef -define KernelPackage/mmc-spi/description - Kernel support for MMC/SD over SPI +define KernelPackage/input-rb532/description + Kernel module for RB532 button endef -$(eval $(call KernelPackage,mmc-spi)) +$(eval $(call KernelPackage,input-rb532)) + define KernelPackage/mmc-atmelmci SUBMENU:=$(OTHER_MENU) @@ -688,81 +768,83 @@ 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-old +define KernelPackage/cs5535-gpio SUBMENU:=$(OTHER_MENU) - TITLE:=Old GPIO based bitbanging SPI controller (DEPRECATED) - DEPENDS:=@GPIO_SUPPORT +kmod-spi-bitbang - KCONFIG:=CONFIG_SPI_GPIO_OLD - FILES:=$(LINUX_DIR)/drivers/spi/spi_gpio_old.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,92,spi_gpio_old) + 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-old/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-old)) +$(eval $(call KernelPackage,cs5535-gpio)) + -define KernelPackage/spi-gpio +define KernelPackage/ixp4xx-beeper SUBMENU:=$(OTHER_MENU) - TITLE:=GPIO-based bitbanging SPI Master - 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:=IXP4XX Beeper support + DEPENDS:=@TARGET_ixp4xx +kmod-input-core + KCONFIG:= \ + CONFIG_INPUT_MISC=y \ + CONFIG_INPUT_IXP4XX_BEEPER + FILES:=$(LINUX_DIR)/drivers/input/misc/ixp4xx-beeper.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,50,ixp4xx-beeper) endef -define KernelPackage/spi-gpio/description - This package contains the GPIO-based bitbanging SPI Master +define KernelPackage/ixp4xx-beeper/description + IXP4XX Beeper support endef -$(eval $(call KernelPackage,spi-gpio)) +$(eval $(call KernelPackage,ixp4xx-beeper)) -define KernelPackage/spi-dev - SUBMENU:=$(OTHER_MENU) - TITLE:=User mode SPI device driver + +define KernelPackage/textsearch +SUBMENU:=$(OTHER_MENU) + TITLE:=Textsearch support is selected if needed 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) + 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 -define KernelPackage/spi-dev/description - This package contains the user mode SPI device driver -endef +$(eval $(call KernelPackage,textsearch)) -$(eval $(call KernelPackage,spi-dev)) -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:=@TARGET_x86||TARGET_olpc||TARGET_s3c24xx||TARGET_brcm47xx||TARGET_ar71xx + KCONFIG:= \ + CONFIG_RFKILL \ + CONFIG_RFKILL_INPUT=y \ + CONFIG_RFKILL_LEDS=y +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.31)),1) + FILES:= \ + $(LINUX_DIR)/net/rfkill/rfkill.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,20,rfkill) +else + 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) +endif 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))