X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fother.mk;h=5f82c8a66f6e4af26741cbd59a0672e4c6130b86;hp=a6b3f2d651b322e1d6bb0b3c941d81765069397a;hb=78be22e32d594fe0a54da0fdb78ee9898c45145b;hpb=cd2cccd2ff1b994882d1e93c8692a98ceb53002e diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index a6b3f2d651..5f82c8a66f 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -6,10 +6,10 @@ # # $Id$ -EMENU:=Other modules +OTHER_MENU:=Other modules define KernelPackage/crc-itu-t - SUBMENU:=$(EMENU) + SUBMENU:=$(OTHER_MENU) TITLE:=CRC ITU-T V.41 support KCONFIG:=CONFIG_CRC_ITU_T FILES:=$(LINUX_DIR)/lib/crc-itu-t.$(LINUX_KMOD_SUFFIX) @@ -23,43 +23,8 @@ endef $(eval $(call KernelPackage,crc-itu-t)) -define KernelPackage/crypto - SUBMENU:=$(EMENU) - 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:=$(EMENU) + SUBMENU:=$(OTHER_MENU) TITLE:=EEPROM 93CX6 support DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_EEPROM_93CX6 @@ -75,7 +40,7 @@ $(eval $(call KernelPackage,eeprom-93cx6)) define KernelPackage/lp - SUBMENU:=$(EMENU) + SUBMENU:=$(OTHER_MENU) TITLE:=Parallel port and line printer support DEPENDS:=@LINUX_2_4 KCONFIG:= \ @@ -92,128 +57,13 @@ endef $(eval $(call KernelPackage,lp)) -define KernelPackage/soundcore - SUBMENU:=$(EMENU) - TITLE:=Sound support - 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/loop - SUBMENU:=$(EMENU) - TITLE:=Loopback device support - KCONFIG:=CONFIG_BLK_DEV_LOOP - FILES:=$(LINUX_DIR)/drivers/block/loop.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,loop) -endef - -define KernelPackage/loop/description - Kernel module for loopback device support -endef - -$(eval $(call KernelPackage,loop)) - - -define KernelPackage/nbd - SUBMENU:=$(EMENU) - TITLE:=Network block device support - KCONFIG:=CONFIG_BLK_DEV_NBD - FILES:=$(LINUX_DIR)/drivers/block/nbd.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,nbd) -endef - -define KernelPackage/nbd/description - Kernel module for network block device support -endef - -$(eval $(call KernelPackage,nbd)) - - -define KernelPackage/capi - SUBMENU:=$(EMENU) - TITLE:=CAPI Support - DEPENDS:=@LINUX_2_6 - KCONFIG:= \ - CONFIG_ISDN \ - CONFIG_ISDN_CAPI \ - CONFIG_ISDN_CAPI_CAPI20 - FILES:= \ - $(LINUX_DIR)/drivers/isdn/capi/kernelcapi.$(LINUX_KMOD_SUFFIX) \ - $(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi) -endef - -define KernelPackage/capi/description - Kernel module for basic CAPI support -endef - -$(eval $(call KernelPackage,capi)) - - define KernelPackage/pcmcia-core - SUBMENU:=$(EMENU) + SUBMENU:=$(OTHER_MENU) TITLE:=PCMCIA/CardBus support DEPENDS:=@PCMCIA_SUPPORT KCONFIG:= \ CONFIG_PCMCIA \ - CONFIG_CARDBUS + CONFIG_CARDBUS \ CONFIG_PCCARD \ CONFIG_YENTA \ CONFIG_PCCARD_NONSTATIC \ @@ -263,7 +113,7 @@ $(eval $(call KernelPackage,pcmcia-core)) define KernelPackage/pcmcia-serial - SUBMENU:=$(EMENU) + SUBMENU:=$(OTHER_MENU) TITLE:=Serial devices support DEPENDS:=kmod-pcmcia-core KCONFIG:= \ @@ -289,10 +139,11 @@ endef $(eval $(call KernelPackage,pcmcia-serial)) +# XXX: remove @!TARGET_* later when we have USB support properly detected on all targets define KernelPackage/bluetooth - SUBMENU:=$(EMENU) + SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support - DEPENDS:=@USB_SUPPORT + DEPENDS:=@USB_SUPPORT @!TARGET_atheros @!TARGET_uml KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ @@ -358,7 +209,7 @@ $(eval $(call KernelPackage,bluetooth)) define KernelPackage/mmc - SUBMENU:=$(EMENU) + SUBMENU:=$(OTHER_MENU) TITLE:=MMC/SD Card Support DEPENDS:=@TARGET_at91 KCONFIG:= \ @@ -379,30 +230,82 @@ 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:=$(EMENU) + 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 - SUBMENU:=$(EMENU) + SUBMENU:=$(OTHER_MENU) TITLE:=Soekris Net48xx LED support DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_LEDS_NET48XX @@ -417,8 +320,55 @@ endef $(eval $(call KernelPackage,leds-net48xx)) +define KernelPackage/leds-wrap + SUBMENU:=$(OTHER_MENU) + TITLE:=PCengines WRAP LED support + DEPENDS:=@TARGET_x86 + KCONFIG:=CONFIG_LEDS_WRAP + FILES:=$(LINUX_DIR)/drivers/leds/leds-wrap.$(LINUX_KMOD_SUFFIX) + AUTOLOAD:=$(call AutoLoad,50,leds-wrap) +endef + +define KernelPackage/leds-wrap/description + Kernel module for PCengines WRAP LEDs +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-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:=$(EMENU) + SUBMENU:=$(OTHER_MENU) TITLE:=Natsemi GPIO support DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_NSC_GPIO @@ -434,7 +384,7 @@ $(eval $(call KernelPackage,nsc-gpio)) define KernelPackage/scx200-gpio - SUBMENU:=$(EMENU) + SUBMENU:=$(OTHER_MENU) TITLE:=Natsemi SCX200 GPIO support DEPENDS:=@TARGET_x86 kmod-nsc-gpio KCONFIG:=CONFIG_SCx200_GPIO @@ -450,7 +400,7 @@ $(eval $(call KernelPackage,scx200-gpio)) define KernelPackage/scx200-wdt - SUBMENU:=$(EMENU) + SUBMENU:=$(OTHER_MENU) TITLE:=Natsemi SCX200 Watchdog support DEPENDS:=@TARGET_x86 KCONFIG:=CONFIG_SC1200_WDT @@ -465,45 +415,8 @@ endef $(eval $(call KernelPackage,scx200-wdt)) -define KernelPackage/hwmon - SUBMENU:=$(EMENU) - 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:=$(EMENU) - 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:=$(EMENU) + SUBMENU:=$(OTHER_MENU) TITLE:=Input device core DEPENDS:=@LINUX_2_6 KCONFIG:=CONFIG_INPUT @@ -519,7 +432,7 @@ $(eval $(call KernelPackage,input-core)) define KernelPackage/input-evdev - SUBMENU:=$(EMENU) + SUBMENU:=$(OTHER_MENU) TITLE:=Input even device DEPENDS:=+kmod-input-core KCONFIG:=CONFIG_INPUT_EVDEV