X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/ccd6b5b27f2bb9f9fc50d5efb1ade3f6ca82e206..71d6652e39edfb3381f0eed8928c648deea83b6a:/package/kernel/modules/other.mk diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 392a88ed0..3844068b7 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. @@ -121,7 +121,6 @@ endef $(eval $(call KernelPackage,pcspkr)) -# This activates PCMCIA support in ssb. This will be included in kmod-ssb. define KernelPackage/pcmcia-core SUBMENU:=$(OTHER_MENU) TITLE:=PCMCIA/CardBus support @@ -130,11 +129,7 @@ define KernelPackage/pcmcia-core CONFIG_PCMCIA \ CONFIG_CARDBUS \ CONFIG_PCCARD \ - CONFIG_YENTA \ CONFIG_PCCARD_NONSTATIC \ - CONFIG_SSB_PCMCIAHOST=y \ - CONFIG_SSB_PCMCIAHOST_POSSIBLE=y \ - CONFIG_SSB_BLOCKIO=y \ PCMCIA_DEBUG=n endef @@ -152,14 +147,12 @@ 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,25,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 @@ -174,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)) @@ -680,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 @@ -713,23 +725,6 @@ endef $(eval $(call KernelPackage,input-joydev)) -define KernelPackage/mmc-spi - 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) -endef - -define KernelPackage/mmc-spi/description - Kernel support for MMC/SD over SPI -endef - -$(eval $(call KernelPackage,mmc-spi)) - define KernelPackage/mmc-atmelmci SUBMENU:=$(OTHER_MENU) TITLE:=Amtel MMC Support @@ -745,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) @@ -862,7 +779,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 @!TARGET_uml + DEPENDS:=@TARGET_x86||TARGET_olpc||TARGET_s3c24xx||TARGET_brcm47xx KCONFIG:= \ CONFIG_RFKILL \ CONFIG_RFKILL_INPUT \