X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fother.mk;h=f430c284cac8983ee9039d26d47f0dade25f2244;hb=d0a1717399e7d402c1768299ed17bf07104f81b4;hp=171c9ce711d8a36594086b60b6122ca7eb26c285;hpb=aa1c1c4aa3fca312006742171caac1dca853c579;p=openwrt%2Fopenwrt.git diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 171c9ce711..f430c284ca 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -23,41 +23,6 @@ endef $(eval $(call KernelPackage,crc-itu-t)) -define KernelPackage/crypto - SUBMENU:=$(OTHER_MENU) - TITLE:=CryptoAPI modules - KCONFIG:= \ - CONFIG_CRYPTO_HMAC=m \ - CONFIG_CRYPTO_NULL=m \ - CONFIG_CRYPTO_MD4=m \ - CONFIG_CRYPTO_MD5=m \ - CONFIG_CRYPTO_SHA1=m \ - CONFIG_CRYPTO_SHA256=m \ - CONFIG_CRYPTO_SHA512=m \ - CONFIG_CRYPTO_WP512=m \ - CONFIG_CRYPTO_TGR192=m \ - CONFIG_CRYPTO_DES=m \ - CONFIG_CRYPTO_BLOWFISH=m \ - CONFIG_CRYPTO_TWOFISH=m \ - CONFIG_CRYPTO_SERPENT=m \ - CONFIG_CRYPTO_AES=m \ - CONFIG_CRYPTO_CAST5=m \ - CONFIG_CRYPTO_CAST6=m \ - CONFIG_CRYPTO_TEA=m \ - CONFIG_CRYPTO_ARC4=m \ - CONFIG_CRYPTO_KHAZAD=m \ - CONFIG_CRYPTO_ANUBIS=m \ - CONFIG_CRYPTO_DEFLATE=m \ - CONFIG_CRYPTO_MICHAEL_MIC=m \ - CONFIG_CRYPTO_CRC32C=m \ - CONFIG_CRYPTO_ECB=m \ - CONFIG_CRYPTO_BLKCIPHER=m - FILES:=$(LINUX_DIR)/crypto/*.$(LINUX_KMOD_SUFFIX) -endef - -$(eval $(call KernelPackage,crypto)) - - define KernelPackage/eeprom-93cx6 SUBMENU:=$(OTHER_MENU) TITLE:=EEPROM 93CX6 support @@ -92,79 +57,13 @@ endef $(eval $(call KernelPackage,lp)) -# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets -define KernelPackage/soundcore - SUBMENU:=$(OTHER_MENU) - TITLE:=Sound support - DEPENDS:=@USB_SUPPORT @!TARGET_atheros - KCONFIG:= \ - CONFIG_SOUND \ - CONFIG_SND \ - CONFIG_SND_HWDEP \ - CONFIG_SND_RAWMIDI \ - CONFIG_SND_TIMER \ - CONFIG_SND_PCM \ - CONFIG_HOSTAUDIO -endef - -define KernelPackage/soundcore/2.4 - FILES:=$(LINUX_DIR)/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,soundcore) -endef - -define KernelPackage/soundcore/2.6 -# KCONFIG+= \ -# CONFIG_SND \ -# CONFIG_SND_HWDEP \ -# CONFIG_SND_RAWMIDI \ -# CONFIG_SND_TIMER \ -# CONFIG_SND_PCM - FILES:= \ - $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-page-alloc.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-hwdep.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-rawmidi.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-timer.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/sound/core/snd-pcm.$(LINUX_KMOD_SUFFIX) \ - $(if $(CONFIG_SND_MIXER_OSS),$(LINUX_DIR)/sound/core/oss/snd-mixer-oss.$(LINUX_KMOD_SUFFIX)) \ - $(if $(CONFIG_SND_PCM_OSS),$(LINUX_DIR)/sound/core/oss/snd-pcm-oss.$(LINUX_KMOD_SUFFIX)) - AUTOLOAD:=$(call AutoLoad,30, \ - soundcore \ - snd \ - snd-page-alloc \ - snd-hwdep \ - snd-rawmidi \ - snd-timer \ - snd-pcm \ - $(if $(CONFIG_SND_MIXER_OSS),snd-mixer-oss) \ - $(if $(CONFIG_SND_PCM_OSS),snd-pcm-oss) \ - ) -endef - -define KernelPackage/soundcore/uml-2.6 -# KCONFIG+= \ -# CONFIG_HOSTAUDIO - FILES:= \ - $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio) -endef - -define KernelPackage/soundcore/description - Kernel modules for sound support -endef - -$(eval $(call KernelPackage,soundcore)) - - define KernelPackage/pcmcia-core SUBMENU:=$(OTHER_MENU) TITLE:=PCMCIA/CardBus support DEPENDS:=@PCMCIA_SUPPORT KCONFIG:= \ CONFIG_PCMCIA \ - CONFIG_CARDBUS + CONFIG_CARDBUS \ CONFIG_PCCARD \ CONFIG_YENTA \ CONFIG_PCCARD_NONSTATIC \ @@ -244,7 +143,7 @@ $(eval $(call KernelPackage,pcmcia-serial)) define KernelPackage/bluetooth SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support - DEPENDS:=@USB_SUPPORT @!TARGET_atheros + DEPENDS:=@USB_SUPPORT @!TARGET_atheros @!TARGET_uml KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ @@ -331,26 +230,78 @@ endef $(eval $(call KernelPackage,mmc)) +# XXX: added a workaround for watchdog path changes +ifeq ($(KERNEL),2.4) + WATCHDOG_DIR=char +endif +ifeq ($(KERNEL_PATCHVER),2.6.24) + WATCHDOG_DIR=watchdog +endif +WATCHDOG_DIR?=char/watchdog + define KernelPackage/softdog SUBMENU:=$(OTHER_MENU) TITLE:=Software watchdog driver KCONFIG:=CONFIG_SOFT_WATCHDOG + FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/softdog.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,softdog) endef -define KernelPackage/softdog/2.4 - FILES:=$(LINUX_DIR)/drivers/char/softdog.o +define KernelPackage/softdog/description + Software watchdog driver endef -define KernelPackage/softdog/2.6 - FILES:=$(LINUX_DIR)/drivers/char/watchdog/softdog.ko +$(eval $(call KernelPackage,softdog)) + + +# XXX: remove @TARGET_* later when we are able to detect the exact version of the kernel +define KernelPackage/leds-gpio + SUBMENU:=$(OTHER_MENU) + TITLE:=GPIO LED support + DEPENDS:=@TARGET_adm5120 + KCONFIG:=CONFIG_LEDS_GPIO + FILES:=$(LINUX_DIR)/drivers/leds/leds-gpio.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,60,leds-gpio) endef -define KernelPackage/softdog/description - Software watchdog driver +define KernelPackage/leds-gpio/description + Kernel module for LEDs on GPIO lines endef -$(eval $(call KernelPackage,softdog)) +$(eval $(call KernelPackage,leds-gpio)) + + +define KernelPackage/leds-adm5120 + SUBMENU:=$(OTHER_MENU) + TITLE:=ADM5120 LED support + DEPENDS:=@TARGET_adm5120 +kmod-leds-gpio + KCONFIG:=CONFIG_LEDS_ADM5120 + FILES:=$(LINUX_DIR)/drivers/leds/leds-adm5120.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,59,leds-adm5120) +endef + +define KernelPackage/leds-adm5120/description + Kernel module for LEDs on ADM5120 based boards. +endef + +$(eval $(call KernelPackage,leds-adm5120)) + + +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 @@ -385,6 +336,52 @@ endef $(eval $(call KernelPackage,leds-wrap)) +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) +endef + +define KernelPackage/leds-alix/description + Kernel module for PCengines ALIX LEDs +endef + +$(eval $(call KernelPackage,leds-alix)) + + +define KernelPackage/ledtrig-netdev + SUBMENU:=$(OTHER_MENU) + TITLE:=LED NETDEV Trigger + KCONFIG:=CONFIG_LEDS_TRIGGER_NETDEV + FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-netdev.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,50,ledtrig-netdev) +endef + +define KernelPackage/ledtrig-netdev/description + Kernel module to drive LEDs based on network activity. +endef + +$(eval $(call KernelPackage,ledtrig-netdev)) + + +define KernelPackage/ledtrig-morse + SUBMENU:=$(OTHER_MENU) + TITLE:=LED Morse Trigger + KCONFIG:=CONFIG_LEDS_TRIGGER_MORSE + FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-morse.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,50,ledtrig-morse) +endef + +define KernelPackage/ledtrig-morse/description + Kernel module to show morse coded messages on LEDs. +endef + +$(eval $(call KernelPackage,ledtrig-morse)) + + define KernelPackage/nsc-gpio SUBMENU:=$(OTHER_MENU) TITLE:=Natsemi GPIO support @@ -433,43 +430,6 @@ endef $(eval $(call KernelPackage,scx200-wdt)) -define KernelPackage/hwmon - SUBMENU:=$(OTHER_MENU) - TITLE:=Hardware monitoring support - DEPENDS:=@LINUX_2_6 - KCONFIG:= \ - CONFIG_HWMON \ - CONFIG_HWMON_VID \ - CONFIG_HWMON_DEBUG_CHIP=n - FILES:= \ - $(LINUX_DIR)/drivers/hwmon/hwmon.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/hwmon/hwmon-vid.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,40,hwmon hwmon-vid) -endef - -define KernelPackage/hwmon/description - Kernel modules for hardware monitoring -endef - -$(eval $(call KernelPackage,hwmon)) - - -define KernelPackage/hwmon-pc87360 - SUBMENU:=$(OTHER_MENU) - TITLE:=PC87360 monitoring support - DEPENDS:=kmod-hwmon - KCONFIG:=CONFIG_SENSORS_PC87360 - FILES:=$(LINUX_DIR)/drivers/hwmon/pc87360.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,50,pc87360) -endef - -define KernelPackage/hwmon-pc87360/description - Kernel modules for PC87360 chips -endef - -$(eval $(call KernelPackage,hwmon-pc87360)) - - define KernelPackage/input-core SUBMENU:=$(OTHER_MENU) TITLE:=Input device core