X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Fkernel%2Fmodules%2Fother.mk;h=549019a74d95a73e4c70666d9b884a3e306d2c01;hp=0670a3ce1ca940131197076da846f1539d6a153f;hb=f60d180330c2dd9a139368f504a4473c055490fb;hpb=ce19a369af232ac48f9b27a2e20af87b1129cb6b

diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 0670a3ce1c..549019a74d 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -11,30 +11,32 @@ EMENU:=Other modules
 define KernelPackage/crypto
   TITLE:=CryptoAPI modules
   KCONFIG:= \
-	$(CONFIG_CRYPTO_HMAC) \
-	$(CONFIG_CRYPTO_NULL) \
-	$(CONFIG_CRYPTO_MD4) \
-	$(CONFIG_CRYPTO_MD5) \
-	$(CONFIG_CRYPTO_SHA1) \
-	$(CONFIG_CRYPTO_SHA256) \
-	$(CONFIG_CRYPTO_SHA512) \
-	$(CONFIG_CRYPTO_WP512) \
-	$(CONFIG_CRYPTO_TGR192) \
-	$(CONFIG_CRYPTO_DES) \
-	$(CONFIG_CRYPTO_BLOWFISH) \
-	$(CONFIG_CRYPTO_TWOFISH) \
-	$(CONFIG_CRYPTO_SERPENT) \
-	$(CONFIG_CRYPTO_AES) \
-	$(CONFIG_CRYPTO_CAST5) \
-	$(CONFIG_CRYPTO_CAST6) \
-	$(CONFIG_CRYPTO_TEA) \
-	$(CONFIG_CRYPTO_ARC4) \
-	$(CONFIG_CRYPTO_KHAZAD) \
-	$(CONFIG_CRYPTO_ANUBIS) \
-	$(CONFIG_CRYPTO_DEFLATE) \
-	$(CONFIG_CRYPTO_MICHAEL_MIC) \
-	$(CONFIG_CRYPTO_CRC32C)
-  FILES:=$(MODULES_DIR)/kernel/crypto/*.$(LINUX_KMOD_SUFFIX)
+	CONFIG_CRYPTO_HMAC \
+	CONFIG_CRYPTO_NULL \
+	CONFIG_CRYPTO_MD4 \
+	CONFIG_CRYPTO_MD5 \
+	CONFIG_CRYPTO_SHA1 \
+	CONFIG_CRYPTO_SHA256 \
+	CONFIG_CRYPTO_SHA512 \
+	CONFIG_CRYPTO_WP512 \
+	CONFIG_CRYPTO_TGR192 \
+	CONFIG_CRYPTO_DES \
+	CONFIG_CRYPTO_BLOWFISH \
+	CONFIG_CRYPTO_TWOFISH \
+	CONFIG_CRYPTO_SERPENT \
+	CONFIG_CRYPTO_AES \
+	CONFIG_CRYPTO_CAST5 \
+	CONFIG_CRYPTO_CAST6 \
+	CONFIG_CRYPTO_TEA \
+	CONFIG_CRYPTO_ARC4 \
+	CONFIG_CRYPTO_KHAZAD \
+	CONFIG_CRYPTO_ANUBIS \
+	CONFIG_CRYPTO_DEFLATE \
+	CONFIG_CRYPTO_MICHAEL_MIC \
+	CONFIG_CRYPTO_CRC32C \
+	CONFIG_CRYPTO_ECB \
+	CONFIG_CRYPTO_BLKCIPHER 
+  FILES:=$(LINUX_DIR)/crypto/*.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=$(EMENU)
 endef
 $(eval $(call KernelPackage,crypto))
@@ -48,38 +50,333 @@ define KernelPackage/ide-core
 	- ide-core \\\
 	- ide-detect \\\
 	- ide-disk
-  KCONFIG:=$(CONFIG_IDE)
-  FILES:=$(MODULES_DIR)/kernel/drivers/ide/*.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_IDE
+  FILES:=$(LINUX_DIR)/drivers/ide/*.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=$(EMENU)
-  AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-detect ide-disk)
+  AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-generic ide-detect ide-disk)
 endef
 $(eval $(call KernelPackage,ide-core))
 
 define KernelPackage/ide-pdc202xx
   TITLE:=PDC202xx IDE driver
-  KCONFIG:=$(CONFIG_BLK_DEV_PDC202XX_OLD)
-  FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
+  SUBMENU:=$(EMENU)
+  DEPENDS:=@LINUX_2_4
+  KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD
+  FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old)
 endef
 $(eval $(call KernelPackage,ide-pdc202xx))
 
+define KernelPackage/ide-aec62xx
+  TITLE:=AEC62xx IDE driver
+  SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_BLK_DEV_AEC62XX
+  FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,aec62xx)
+endef
+$(eval $(call KernelPackage,ide-aec62xx))
+
+define KernelPackage/scsi-core
+  TITLE:=Kernel support for SCSI
+  SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_SCSI CONFIG_BLK_DEV_SD
+  FILES:= \
+    $(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \
+    $(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,scsi-core))
 
 define KernelPackage/lp
   TITLE:=Parallel port and line printer support
-  KCONFIG:=$(CONFIG_PARPORT)
+  DEPENDS:=@LINUX_2_4
+  KCONFIG:=CONFIG_PARPORT
   FILES:= \
-	$(MODULES_DIR)/kernel/drivers/parport/parport.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/drivers/parport/parport_*.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/drivers/char/lp.$(LINUX_KMOD_SUFFIX) \
-	$(MODULES_DIR)/kernel/drivers/char/ppdev.$(LINUX_KMOD_SUFFIX)
+	$(LINUX_DIR)/drivers/parport/parport.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/char/lp.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/char/ppdev.$(LINUX_KMOD_SUFFIX)
   SUBMENU:=$(EMENU)
   AUTOLOAD:=$(call AutoLoad,50, \
   	parport \
-  	parport_splink \
   	lp \
   )
 endef
 $(eval $(call KernelPackage,lp))
 
 
+define KernelPackage/soundcore
+  TITLE:=Sound support
+  DESCRIPTION:=Kernel modules for sound support
+  KCONFIG:=CONFIG_SOUND
+  SUBMENU:=$(EMENU)
+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
+  FILES:= \
+	$(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/sound/core/*.$(LINUX_KMOD_SUFFIX) \
+	$(if $(CONFIG_SND_MIXER_OSS)$(CONFIG_SND_PCM_OSS),$(LINUX_DIR)/sound/core/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
+  FILES:= \
+	$(LINUX_DIR)/arch/um/drivers/hostaudio.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,30,soundcore hostaudio)
+endef
+
+$(eval $(call KernelPackage,soundcore))
+
+
+define KernelPackage/loop
+  TITLE:=Loopback device support
+  DESCRIPTION:=Kernel module for loopback device support
+  KCONFIG:=CONFIG_BLK_DEV_LOOP
+  SUBMENU:=$(EMENU)
+  AUTOLOAD:=$(call AutoLoad,30,loop)
+  FILES:=$(LINUX_DIR)/drivers/block/loop.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,loop))
+
+define KernelPackage/nbd
+  TITLE:=Network block device support
+  DESCRIPTION:=Kernel module for network block device support
+  KCONFIG:=CONFIG_BLK_DEV_NBD
+  SUBMENU:=$(EMENU)
+  AUTOLOAD:=$(call AutoLoad,30,nbd)
+  FILES:=$(LINUX_DIR)/drivers/block/nbd.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,nbd))
+
+define KernelPackage/capi
+  TITLE:=CAPI Support
+  DESCRIPTION:=Kernel module for basic CAPI support
+  KCONFIG:=CONFIG_ISDN CONFIG_ISDN_CAPI CONFIG_ISDN_CAPI_CAPI20
+  SUBMENU:=$(EMENU)
+  AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi)
+  FILES:=$(LINUX_DIR)/drivers/isdn/capi/*capi.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,capi))
+
+define KernelPackage/pcmcia-core
+  TITLE:=PCMCIA/CardBus support
+  DESCRIPTION:=Kernel support for PCMCIA/CardBus controllers
+  SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_PCMCIA CONFIG_PCCARD
+endef
+
+define KernelPackage/pcmcia-core/2.4
+  FILES:= \
+	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core yenta_socket ds)
+endef
+
+define KernelPackage/pcmcia-core/2.6
+  FILES:= \
+	$(LINUX_DIR)/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \
+	$(if $(CONFIG_PCMCIA),$(LINUX_DIR)/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX)) \
+	$(LINUX_DIR)/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,pcmcia_core pcmcia rsrc_nonstatic yenta_socket)
+endef
+$(eval $(call KernelPackage,pcmcia-core))
+
+
+define KernelPackage/pcmcia-serial
+  TITLE:=Serial devices support
+  DESCRIPTION:=Kernel support for PCMCIA/CardBus serial devices
+  DEPENDS:=kmod-pcmcia-core
+  SUBMENU:=$(EMENU)
+  AUTOLOAD:=$(call AutoLoad,45,serial_cs)
+  KCONFIG:=CONFIG_PCMCIA_SERIAL_CS CONFIG_SERIAL_8250_CS
+endef
+
+define KernelPackage/pcmcia-serial/2.4
+  FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.$(LINUX_KMOD_SUFFIX)
+endef
+
+define KernelPackage/pcmcia-serial/2.6
+  FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX)
+endef
+$(eval $(call KernelPackage,pcmcia-serial))
+
+
+define KernelPackage/bluetooth
+  TITLE:=Bluetooth support
+  DEPENDS:=@USB_SUPPORT
+  DESCRIPTION:=Kernel support for Bluetooth devices
+  SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_BLUEZ CONFIG_BT
+ endef
+
+ define KernelPackage/bluetooth/2.4
+  FILES:= \
+	$(LINUX_DIR)/net/bluetooth/bluez.$(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)/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,90,bluez l2cap sco rfcomm bnep hci_uart hci_usb)
+endef
+
+define KernelPackage/bluetooth/2.6
+  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)/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 hci_uart hci_usb)
+endef
+$(eval $(call KernelPackage,bluetooth))
+
+define KernelPackage/mmc
+  TITLE:=MMC/SD Card Support
+  DEPENDS:=@LINUX_2_6_AT91
+  DESCRIPTION:=Kernel support for MMC/SD cards
+  SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_MMC
+  FILES:= \
+	$(LINUX_DIR)/drivers/mmc/mmc_core.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/mmc/mmc_block.$(LINUX_KMOD_SUFFIX) \
+	$(LINUX_DIR)/drivers/mmc/at91_mci.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,90,mmc_core mmc_block at91_mci)
+endef
+$(eval $(call KernelPackage,mmc))
+
+define KernelPackage/softdog
+  TITLE:=Software watchdog driver
+  DESCRIPTION:=Software watchdog driver
+  SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_SOFT_WATCHDOG
+  FILES:=$(LINUX_DIR)/drivers/char/softdog.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,softdog)
+endef
+
+define KernelPackage/softdog/2.4
+  FILES:=$(LINUX_DIR)/drivers/char/softdog.o
+endef
+
+define KernelPackage/softdog/2.6
+  FILES:=$(LINUX_DIR)/drivers/char/watchdog/softdog.ko
+endef
+$(eval $(call KernelPackage,softdog))
+
+
+define KernelPackage/videodev
+  TITLE=Video4Linux support
+  DESCRIPTION:=Kernel modules for Video4Linux support
+  DEPENDS:=@VIDEO_SUPPORT
+  SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_VIDEO_DEV
+  FILES:=$(LINUX_DIR)/drivers/media/video/*.$(LINUX_KMOD_SUFFIX)
+endef
+
+define KernelPackage/videodev/2.4
+  AUTOLOAD:=$(call AutoLoad,60,videodev)
+endef
+
+define KernelPackage/videodev/2.6
+  AUTOLOAD:=$(call AutoLoad,60,v4l2-common v4l1-compat compat_ioctl32 videodev)
+endef
+$(eval $(call KernelPackage,videodev))
+
+define KernelPackage/leds-net48xx
+  TITLE:=Soekris Net48xx LED support
+  DESCRIPTION:=Kernel module for Soekris Net48xx LEDs
+  DEPENDS:=@LINUX_2_6_X86
+  SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_LEDS_NET48XX
+  FILES:=$(LINUX_DIR)/drivers/leds/leds-net48xx.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,leds-net48xx)
+endef
+$(eval $(call KernelPackage,leds-net48xx))
+
+define KernelPackage/nsc-gpio
+  TITLE:=Natsemi GPIO support
+  DESCRIPTION:=Kernel module for Natsemi GPIO
+  DEPENDS:=@LINUX_2_6_X86
+  SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_NSC_GPIO
+  FILES:=$(LINUX_DIR)/drivers/char/nsc_gpio.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,40,nsc_gpio)
+endef
+$(eval $(call KernelPackage,nsc-gpio))
+
+define KernelPackage/scx200-gpio
+  TITLE:=Natsemi SCX200 GPIO support
+  DESCRIPTION:=Kernel module for SCX200 GPIO
+  DEPENDS:=kmod-nsc-gpio @LINUX_2_6_X86
+  SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_SCx200_GPIO
+  FILES:=$(LINUX_DIR)/drivers/char/scx200_gpio.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,scx200_gpio)
+endef
+$(eval $(call KernelPackage,scx200-gpio))
+
+define KernelPackage/scx200-wdt
+  TITLE:=Natsemi SCX200 Watchdog support
+  DESCRIPTION:=Kernel module for SCX200 Watchdog
+  DEPENDS:=@LINUX_2_6_X86
+  SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_SC1200_WDT
+  FILES:=$(LINUX_DIR)/drivers/char/watchdog/scx200_wdt.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,scx200_wdt)
+endef
+$(eval $(call KernelPackage,scx200-wdt))
+
+define KernelPackage/hwmon
+  TITLE:=Hardware monitoring support
+  DESCRIPTION:=Kernel modules for hardware monitoring
+  SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_HWMON_VID
+  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
+$(eval $(call KernelPackage,hwmon))
+
+define KernelPackage/hwmon-pc87360
+  TITLE:=PC87360 monitoring support
+  DESCRIPTION:=Kernel modules for PC87360 chips
+  DEPENDS:=kmod-hwmon
+  SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_SENSORS_PC87360
+  FILES:=$(LINUX_DIR)/drivers/hwmon/pc87360.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,pc87360)
+endef
+$(eval $(call KernelPackage,hwmon-pc87360))
+
+define KernelPackage/input-core
+  TITLE:=Input device core
+  DESCRIPTION:=Kernel modules for support of input device
+  SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_INPUT
+  FILES:=$(LINUX_DIR)/drivers/input/input-core.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,50,input-core)
+endef
+$(eval $(call KernelPackage,input-core))
+
+define KernelPackage/input-evdev
+  TITLE:=Input even device
+  DESCRIPTION:=Kernel modules for support of input device events
+  DEPENDS:=+kmod-input-core
+  SUBMENU:=$(EMENU)
+  KCONFIG:=CONFIG_INPUT_EVDEV
+  FILES:=$(LINUX_DIR)/drivers/input/evdev.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,60,evdev)
+endef
+$(eval $(call KernelPackage,input-evdev))