X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fother.mk;h=0b6d3fa1eac3e4d7c224e2231813c913685ac0af;hb=77db1e61b6cd4dbb086d150c2361350d45be3ebf;hp=86b02a40f08c3ffcbdee5fdf05a466bdd6a957ce;hpb=0fd5c228ecc77d51e51296a9a581318bcfad60a7;p=openwrt.git diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 86b02a40f0..0b6d3fa1ea 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -56,7 +56,8 @@ define KernelPackage/crc16 TITLE:=CRC16 support KCONFIG:=CONFIG_CRC16 FILES:=$(LINUX_DIR)/lib/crc16.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,20,crc16) + AUTOLOAD:=$(call AutoLoad,20,crc16,1) + $(call SetDepends/crc16) endef define KernelPackage/crc16/description @@ -71,11 +72,7 @@ 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 @@ -103,128 +100,6 @@ 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) - TITLE:=PCMCIA/CardBus support - DEPENDS:=@PCMCIA_SUPPORT - KCONFIG:= \ - CONFIG_PCMCIA \ - CONFIG_CARDBUS \ - CONFIG_PCCARD \ - CONFIG_PCCARD_NONSTATIC \ - PCMCIA_DEBUG=n -endef - -define KernelPackage/pcmcia-core/2.4 -# KCONFIG:= \ -# CONFIG_PCMCIA \ -# CONFIG_CARDBUS - FILES:= \ - $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,25,pcmcia_core ds) -endef - -define KernelPackage/pcmcia-core/2.6 -# KCONFIG:= \ -# CONFIG_PCCARD \ -# CONFIG_PCMCIA \ -# CONFIG_PCCARD_NONSTATIC \ -# PCMCIA_DEBUG=n - FILES:= \ - $(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,25,pcmcia_core pcmcia) -endef - -define KernelPackage/pcmcia-core/description - Kernel support for PCMCIA/CardBus controllers -endef - -$(eval $(call KernelPackage,pcmcia-core)) - - -define KernelPackage/pcmcia-yenta - SUBMENU:=$(OTHER_MENU) - TITLE:=yenta socket driver - DEPENDS:=kmod-pcmcia-core - KCONFIG:=CONFIG_YENTA - 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)) - -define KernelPackage/pcmcia-au1000 - SUBMENU:=$(OTHER_MENU) - TITLE:=RMI/AMD Au1000 PCMCIA support - DEPENDS:=kmod-pcmcia-core @TARGET_au1000 - FILES:=$(LINUX_DIR)/drivers/pcmcia/au1x00_ss.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,41,au1x00_ss) -endef - -$(eval $(call KernelPackage,pcmcia-au1000)) - -define KernelPackage/pcmcia-bcm63xx - SUBMENU:=$(OTHER_MENU) - TITLE:=Broadcom BCM63xx PCMCIA support - DEPENDS:=kmod-pcmcia-core @TARGET_brcm63xx - KCONFIG:=CONFIG_PCMCIA_BCM63XX - FILES:=$(LINUX_DIR)/drivers/pcmcia/bcm63xx_pcmcia.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,41,bcm63xx_pcmcia) -endef - -define KernelPackage/pcmcia-bcm63xx/description - Kernel support for PCMCIA/CardBus controller on the BCM63xx SoC -endef - -$(eval $(call KernelPackage,pcmcia-bcm63xx)) - -define KernelPackage/pcmcia-serial - SUBMENU:=$(OTHER_MENU) - TITLE:=Serial devices support - DEPENDS:=kmod-pcmcia-core - KCONFIG:= \ - CONFIG_PCMCIA_SERIAL_CS \ - CONFIG_SERIAL_8250_CS - AUTOLOAD:=$(call AutoLoad,45,serial_cs) -endef - -define KernelPackage/pcmcia-serial/2.4 -# KCONFIG:=CONFIG_PCMCIA_SERIAL_CS - FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.$(LINUX_KMOD_SUFFIX) -endef - -define KernelPackage/pcmcia-serial/2.6 -# KCONFIG:=CONFIG_SERIAL_8250_CS - FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX) -endef - -define KernelPackage/pcmcia-serial/description - Kernel support for PCMCIA/CardBus serial devices -endef - -$(eval $(call KernelPackage,pcmcia-serial)) define KernelPackage/ssb SUBMENU:=$(OTHER_MENU) @@ -255,7 +130,7 @@ $(eval $(call KernelPackage,ssb)) define KernelPackage/bluetooth SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support - DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-hid + DEPENDS:=@USB_SUPPORT +kmod-usb-core KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ @@ -274,6 +149,9 @@ define KernelPackage/bluetooth CONFIG_BT_HCIUSB \ CONFIG_BT_HCIUART \ CONFIG_BT_HIDP + $(call AddDepends/crc16) + $(call AddDepends/hid) + $(call AddDepends/rfkill) endef define KernelPackage/bluetooth/2.4 @@ -305,7 +183,6 @@ 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) \ @@ -316,18 +193,6 @@ ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.27)),1) $(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 hidp hci_uart hci_usb) -endif endef define KernelPackage/bluetooth/description @@ -354,7 +219,7 @@ define KernelPackage/mmc FILES:= \ $(LINUX_DIR)/drivers/mmc/core/mmc_core.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/mmc/card/mmc_block.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,90,mmc_core mmc_block) + AUTOLOAD:=$(call AutoLoad,90,mmc_core mmc_block,1) endef define KernelPackage/mmc/description @@ -364,45 +229,11 @@ endef $(eval $(call KernelPackage,mmc)) -define KernelPackage/mmc-at91 - SUBMENU:=$(OTHER_MENU) - TITLE:=MMC/SD Card Support on AT91 - DEPENDS:=@TARGET_at91 +kmod-mmc - KCONFIG:=CONFIG_MMC_AT91 - FILES:=$(LINUX_DIR)/drivers/mmc/host/at91_mci.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,90,at91_mci) -endef - -define KernelPackage/mmc-at91/description - Kernel support for MMC/SD cards on the AT91 target -endef - -$(eval $(call KernelPackage,mmc-at91)) - - # XXX: added a workaround for watchdog path changes 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 - -define KernelPackage/atmel-wdt - SUBMENU:=$(OTHER_MENU) - TITLE:=AT32AP700x watchdog - DEPENDS:=@TARGET_avr32 - KCONFIG:=CONFIG_AT32AP700X_WDT - FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/at32ap700x_wdt.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,50,at32ap700x_wdt) -endef - -define KernelPackage/atmel-wdt/description - AT32AP700x watchdog -endef - -$(eval $(call KernelPackage,atmel-wdt)) +WATCHDOG_DIR?=watchdog define KernelPackage/softdog @@ -419,21 +250,6 @@ 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) @@ -451,23 +267,6 @@ endef $(eval $(call KernelPackage,leds-gpio)) -define KernelPackage/ledtrig-adm5120-switch - SUBMENU:=$(OTHER_MENU) - TITLE:=LED ADM5120 Switch Port Status Trigger - DEPENDS:=@TARGET_adm5120 - KCONFIG:=CONFIG_LEDS_TRIGGER_ADM5120_SWITCH - FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-adm5120-switch.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,50,ledtrig-adm5120-switch) -endef - -define KernelPackage/ledtrig-adm5120-switch/description - Kernel module to allow LEDs to be controlled by the port states - of the ADM5120 built-in ethernet switch. -endef - -$(eval $(call KernelPackage,ledtrig-adm5120-switch)) - - define KernelPackage/leds-net48xx SUBMENU:=$(OTHER_MENU) TITLE:=Soekris Net48xx LED support @@ -519,7 +318,7 @@ $(eval $(call KernelPackage,leds-alix)) define KernelPackage/leds-wndr3700-usb SUBMENU:=$(OTHER_MENU) TITLE:=WNDR3700 USB LED support - DEPENDS:= @TARGET_ar71xx + 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) @@ -532,6 +331,22 @@ endef $(eval $(call KernelPackage,leds-wndr3700-usb)) +define KernelPackage/leds-rb750 + SUBMENU:=$(OTHER_MENU) + TITLE:=RouterBOARD 750 LED support + DEPENDS:=@TARGET_ar71xx + KCONFIG:=CONFIG_LEDS_RB750 + FILES:=$(LINUX_DIR)/drivers/leds/leds-rb750.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,60,leds-rb750) +endef + +define KernelPackage/leds-rb750/description + Kernel module for the LEDs on the MikroTik RouterBOARD 750. +endef + +$(eval $(call KernelPackage,leds-rb750)) + + define KernelPackage/ledtrig-netdev SUBMENU:=$(OTHER_MENU) TITLE:=LED NETDEV Trigger @@ -649,6 +464,7 @@ define KernelPackage/input-core KCONFIG:=CONFIG_INPUT FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,19,input-core) + $(call SetDepends/input) endef define KernelPackage/input-core/description @@ -661,10 +477,10 @@ $(eval $(call KernelPackage,input-core)) define KernelPackage/input-evdev SUBMENU:=$(OTHER_MENU) TITLE:=Input event device - DEPENDS:=+kmod-input-core KCONFIG:=CONFIG_INPUT_EVDEV FILES:=$(LINUX_DIR)/drivers/input/evdev.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,evdev) + $(call AddDepends/input) endef define KernelPackage/input-evdev/description @@ -677,10 +493,12 @@ $(eval $(call KernelPackage,input-evdev)) define KernelPackage/hid SUBMENU:=$(OTHER_MENU) TITLE:=HID Devices - DEPENDS:=+kmod-input-core +kmod-input-evdev + DEPENDS:=+kmod-input-evdev KCONFIG:=CONFIG_HID FILES:=$(LINUX_DIR)/drivers/hid/hid.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,61,hid) + $(call SetDepends/hid) + $(call AddDepends/input) endef define KernelPackage/hid/description @@ -693,10 +511,11 @@ $(eval $(call KernelPackage,hid)) define KernelPackage/input-polldev SUBMENU:=$(OTHER_MENU) TITLE:=Polled Input device support - DEPENDS:=+kmod-input-core @LINUX_2_6 + DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_INPUT_POLLDEV FILES:=$(LINUX_DIR)/drivers/input/input-polldev.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,input-polldev) + $(call AddDepends/input) endef define KernelPackage/input-polldev/description @@ -709,10 +528,11 @@ $(eval $(call KernelPackage,input-polldev)) define KernelPackage/input-gpio-keys SUBMENU:=$(OTHER_MENU) TITLE:=GPIO key support - DEPENDS:= @GPIO_SUPPORT +kmod-input-core + DEPENDS:= @GPIO_SUPPORT KCONFIG:=CONFIG_KEYBOARD_GPIO FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,gpio_keys) + $(call AddDepends/input) endef define KernelPackage/input-gpio-keys/description @@ -743,10 +563,10 @@ $(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) + $(call AddDepends/input) endef define KernelPackage/input-joydev/description @@ -755,24 +575,6 @@ endef $(eval $(call KernelPackage,input-joydev)) -define KernelPackage/input-rb532 - SUBMENU:=$(OTHER_MENU) - 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/input-rb532/description - Kernel module for RB532 button -endef - -$(eval $(call KernelPackage,input-rb532)) - - define KernelPackage/mmc-atmelmci SUBMENU:=$(OTHER_MENU) TITLE:=Amtel MMC Support @@ -786,16 +588,16 @@ define KernelPackage/mmc-atmelmci/description Kernel support for Atmel Multimedia Card Interface. endef -$(eval $(call KernelPackage,mmc-atmelmci)) +$(eval $(call KernelPackage,mmc-atmelmci,1)) define KernelPackage/cs5535-gpio SUBMENU:=$(OTHER_MENU) TITLE:=AMD CS5535/CS5536 GPIO driver - DEPENDS:=@TARGET_x86||@TARGET_olpc + DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_CS5535_GPIO FILES:=$(LINUX_DIR)/drivers/char/cs5535_gpio.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,90,cs5535_gpio) + AUTOLOAD:=$(call AutoLoad,50,cs5535_gpio) endef define KernelPackage/cs5535-gpio/description @@ -808,7 +610,7 @@ $(eval $(call KernelPackage,cs5535-gpio)) define KernelPackage/textsearch SUBMENU:=$(OTHER_MENU) TITLE:=Textsearch support is selected if needed - DEPENDS:=@LINUX_2_6 @!LINUX_2_6_21 + DEPENDS:=@LINUX_2_6 KCONFIG:= \ CONFIG_TEXTSEARCH=y \ CONFIG_TEXTSEARCH_KMP \ @@ -827,7 +629,6 @@ $(eval $(call KernelPackage,textsearch)) define KernelPackage/rfkill SUBMENU:=$(OTHER_MENU) TITLE:=RF switch subsystem support - DEPENDS:=@TARGET_x86||TARGET_olpc||TARGET_s3c24xx||TARGET_brcm47xx KCONFIG:= \ CONFIG_RFKILL \ CONFIG_RFKILL_INPUT=y \ @@ -842,6 +643,7 @@ else $(LINUX_DIR)/net/rfkill/rfkill-input.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,20,rfkill rfkill-input) endif + $(call SetDepends/rfkill) endef define KernelPackage/rfkill/description @@ -850,3 +652,34 @@ define KernelPackage/rfkill/description endef $(eval $(call KernelPackage,rfkill)) + +define KernelPackage/geodewdt + SUBMENU:=$(OTHER_MENU) + TITLE:=Geode/LX Watchdog timer + DEPENDS:=@TARGET_x86 @LINUX_2_6 + KCONFIG:=CONFIG_GEODE_WDT + FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/geodewdt.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,50,geodewdt) +endef + +define KernelPackage/geodewdt/description + Kernel module for Geode watchdog timer. +endef + +$(eval $(call KernelPackage,geodewdt)) + +define KernelPackage/pc8736x-gpio + SUBMENU:=$(OTHER_MENU) + TITLE:=PC8736x GPIO support + DEPENDS:=@TARGET_x86 + KCONFIG:=CONFIG_PC8736x_GPIO + FILES:=$(LINUX_DIR)/drivers/char/pc8736x_gpio.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,40,pc8736x_gpio) +endef + +define KernelPackage/pc8736x-gpio/description + Kernel module for PC8736x GPIO +endef + +$(eval $(call KernelPackage,pc8736x-gpio)) +