X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/4462a9c1f07bfa23d5fb522ca67fd75c4d167f3b..40d0e5c66be53d32675afa14df384b3d6d6a2d2e:/package/kernel/modules/other.mk?ds=inline diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 38df6429e..1b8e533cd 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -1,5 +1,5 @@ # -# 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. @@ -71,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 @@ -99,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) @@ -108,7 +129,6 @@ define KernelPackage/pcmcia-core CONFIG_PCMCIA \ CONFIG_CARDBUS \ CONFIG_PCCARD \ - CONFIG_YENTA \ CONFIG_PCCARD_NONSTATIC \ PCMCIA_DEBUG=n endef @@ -120,21 +140,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 @@ -149,8 +167,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)) @@ -213,6 +233,7 @@ define KernelPackage/ssb 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 \ @@ -234,7 +255,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-input-core KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ @@ -249,6 +270,7 @@ define KernelPackage/bluetooth CONFIG_BT_SCO \ CONFIG_BT_RFCOMM \ CONFIG_BT_BNEP \ + CONFIG_BT_HCIBTUSB \ CONFIG_BT_HCIUSB \ CONFIG_BT_HCIUART \ CONFIG_BT_HIDP @@ -283,6 +305,18 @@ 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) \ @@ -293,6 +327,7 @@ define KernelPackage/bluetooth/2.6 $(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 hidp hci_uart hci_usb) +endif endef define KernelPackage/bluetooth/description @@ -582,7 +617,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 @@ -630,7 +665,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,6 +675,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 @@ -657,23 +709,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) @@ -690,84 +740,6 @@ 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 - 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) -endef - -define KernelPackage/spi-gpio-old/description - This package contains the GPIO based bitbanging SPI controller driver -endef - -$(eval $(call KernelPackage,spi-gpio-old)) - -define KernelPackage/spi-gpio - 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) -endef - -define KernelPackage/spi-gpio/description - This package contains the GPIO-based bitbanging SPI Master -endef - -$(eval $(call KernelPackage,spi-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 -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) @@ -807,15 +779,21 @@ $(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:=@TARGET_x86||TARGET_olpc||TARGET_s3c24xx||TARGET_brcm47xx KCONFIG:= \ CONFIG_RFKILL \ CONFIG_RFKILL_INPUT \ 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/rfkill/description @@ -824,4 +802,3 @@ define KernelPackage/rfkill/description endef $(eval $(call KernelPackage,rfkill)) -