X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/955b9896b7d27ec1c9cf6140cc2fefc51d4c539b..72b37ce64ddc428627fe0b3beb8c3206d1645e48:/package/kernel/modules/other.mk diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index fcac951ca..fdadfa10e 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. @@ -129,7 +129,6 @@ define KernelPackage/pcmcia-core CONFIG_PCMCIA \ CONFIG_CARDBUS \ CONFIG_PCCARD \ - CONFIG_YENTA \ CONFIG_PCCARD_NONSTATIC \ PCMCIA_DEBUG=n endef @@ -141,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 @@ -257,7 +255,6 @@ define KernelPackage/bluetooth SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support 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 \ @@ -273,27 +270,9 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.29)),1) CONFIG_BT_RFCOMM \ CONFIG_BT_BNEP \ CONFIG_BT_HCIBTUSB \ - CONFIG_BT_HCIUART \ - CONFIG_BT_HIDP -else - 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_HCIUSB \ CONFIG_BT_HCIUART \ CONFIG_BT_HIDP -endif endef define KernelPackage/bluetooth/2.4 @@ -325,7 +304,7 @@ 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) +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) \ @@ -637,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 @@ -685,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 @@ -695,6 +674,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 @@ -728,23 +724,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 @@ -760,84 +739,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) @@ -877,7 +778,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 \ @@ -894,40 +795,3 @@ define KernelPackage/rfkill/description 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))