X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/90added10f63705e2cb0c475a2bfe2e9e33721bf..222c1e2350d58e5d2d6b3d0253226ed8beca81ae:/package/kernel/modules/other.mk diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 89b5b93ea..d4fbd8ce6 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -33,8 +33,10 @@ define KernelPackage/crypto $(CONFIG_CRYPTO_ANUBIS) \ $(CONFIG_CRYPTO_DEFLATE) \ $(CONFIG_CRYPTO_MICHAEL_MIC) \ - $(CONFIG_CRYPTO_CRC32C) - FILES:=$(MODULES_DIR)/kernel/crypto/*.$(LINUX_KMOD_SUFFIX) + $(CONFIG_CRYPTO_CRC32C) \ + $(CONFIG_CRYPTO_ECB)) \ + $(CONFIG_CRYPTO_BLKCIPHER) + FILES:=$(LINUX_DIR)/crypto/*.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(EMENU) endef $(eval $(call KernelPackage,crypto)) @@ -49,7 +51,7 @@ define KernelPackage/ide-core - ide-detect \\\ - ide-disk KCONFIG:=$(CONFIG_IDE) - FILES:=$(MODULES_DIR)/kernel/drivers/ide/*.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ide/*.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(EMENU) AUTOLOAD:=$(call AutoLoad,20,ide-core) $(call AutoLoad,90,ide-generic ide-detect ide-disk) endef @@ -59,7 +61,7 @@ define KernelPackage/ide-pdc202xx TITLE:=PDC202xx IDE driver SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_BLK_DEV_PDC202XX_OLD) - FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ide/pci/pdc202xx_old.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old) endef $(eval $(call KernelPackage,ide-pdc202xx)) @@ -68,7 +70,7 @@ define KernelPackage/ide-aec62xx TITLE:=AEC62xx IDE driver SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_BLK_DEV_AEC62XX) - FILES:=$(MODULES_DIR)/kernel/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,aec62xx) endef $(eval $(call KernelPackage,ide-aec62xx)) @@ -78,8 +80,8 @@ define KernelPackage/scsi-core SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_BLK_DEV_SD) FILES:= \ - $(MODULES_DIR)/kernel/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/drivers/scsi/scsi_mod.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/drivers/scsi/sd_mod.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,scsi-core)) @@ -87,9 +89,9 @@ define KernelPackage/lp TITLE:=Parallel port and line printer support KCONFIG:=$(CONFIG_PARPORT) FILES:= \ - $(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 \ @@ -107,26 +109,35 @@ define KernelPackage/soundcore endef define KernelPackage/soundcore/2.4 - FILES:=$(MODULES_DIR)/kernel/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/sound/soundcore.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,soundcore) endef define KernelPackage/soundcore/2.6 FILES:= \ - $(MODULES_DIR)/kernel/sound/soundcore.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/sound/core/*.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/sound/core/oss/*.$(LINUX_KMOD_SUFFIX) + $(LINUX_DIR)/sound/soundcore.$(LINUX_KMOD_SUFFIX) \ + $(LINUX_DIR)/sound/core/*.$(LINUX_KMOD_SUFFIX) \ + $(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 snd-mixer-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:=$(MODULES_DIR)/kernel/drivers/block/loop.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/block/loop.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,loop)) @@ -136,7 +147,7 @@ define KernelPackage/nbd KCONFIG:=$(CONFIG_BLK_DEV_NBD) SUBMENU:=$(EMENU) AUTOLOAD:=$(call AutoLoad,30,nbd) - FILES:=$(MODULES_DIR)/kernel/drivers/block/nbd.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/block/nbd.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,nbd)) @@ -146,7 +157,7 @@ define KernelPackage/capi KCONFIG:=$(CONFIG_ISDN) $(CONFIG_ISDN_CAPI) $(CONFIG_ISDN_CAPI_CAPI20) SUBMENU:=$(EMENU) AUTOLOAD:=$(call AutoLoad,30,kernelcapi capi) - FILES:=$(MODULES_DIR)/kernel/drivers/isdn/capi/*capi.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/isdn/capi/*capi.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,capi)) @@ -154,23 +165,24 @@ define KernelPackage/pcmcia-core TITLE:=PCMCIA/CardBus support DESCRIPTION:=Kernel support for PCMCIA/CardBus controllers SUBMENU:=$(EMENU) - KCONFIG:=$(CONFIG_PCMCIA) endef define KernelPackage/pcmcia-core/2.4 + KCONFIG:=$(CONFIG_PCMCIA) FILES:= \ - $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/pcmcia/ds.$(LINUX_KMOD_SUFFIX) + $(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 + KCONFIG:=$(CONFIG_PCCARD) FILES:= \ - $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia_core.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/pcmcia/pcmcia.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/pcmcia/yenta_socket.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/pcmcia/rsrc_nonstatic.$(LINUX_KMOD_SUFFIX) + $(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)) @@ -186,12 +198,12 @@ endef define KernelPackage/pcmcia-serial/2.4 KCONFIG:=$(CONFIG_PCMCIA_SERIAL_CS) - FILES:=$(MODULES_DIR)/kernel/drivers/char/pcmcia/serial_cs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/char/pcmcia/serial_cs.$(LINUX_KMOD_SUFFIX) endef define KernelPackage/pcmcia-serial/2.6 KCONFIG:=$(CONFIG_SERIAL_8250_CS) - FILES:=$(MODULES_DIR)/kernel/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/serial/serial_cs.$(LINUX_KMOD_SUFFIX) endef $(eval $(call KernelPackage,pcmcia-serial)) @@ -206,26 +218,26 @@ define KernelPackage/bluetooth define KernelPackage/bluetooth/2.4 KCONFIG:=$(CONFIG_BLUEZ) FILES:= \ - $(MODULES_DIR)/kernel/net/bluetooth/bluez.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX) + $(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 KCONFIG:=$(CONFIG_BT) FILES:= \ - $(MODULES_DIR)/kernel/net/bluetooth/bluetooth.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/l2cap.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/sco.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/rfcomm.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/net/bluetooth/bnep/bnep.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/bluetooth/hci_uart.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/bluetooth/hci_usb.$(LINUX_KMOD_SUFFIX) + $(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)) @@ -240,9 +252,9 @@ define KernelPackage/mmc define KernelPackage/mmc/2.6 KCONFIG:=$(CONFIG_MMC) FILES:= \ - $(MODULES_DIR)/kernel/drivers/mmc/mmc_core.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/mmc/mmc_block.$(LINUX_KMOD_SUFFIX) \ - $(MODULES_DIR)/kernel/drivers/mmc/at91_mci.$(LINUX_KMOD_SUFFIX) + $(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)) @@ -252,16 +264,16 @@ define KernelPackage/softdog DESCRIPTION:=Software watchdog driver SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_SOFT_WATCHDOG) - FILES:=$(MODULES_DIR)/kernel/drivers/char/softdog.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/char/softdog.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,softdog) endef define KernelPackage/softdog/2.4 - FILES:=$(MODULES_DIR)/kernel/drivers/char/softdog.o + FILES:=$(LINUX_DIR)/drivers/char/softdog.o endef define KernelPackage/softdog/2.6 - FILES:=$(MODULES_DIR)/kernel/drivers/char/watchdog/softdog.ko + FILES:=$(LINUX_DIR)/drivers/char/watchdog/softdog.ko endef $(eval $(call KernelPackage,softdog)) @@ -273,7 +285,7 @@ define KernelPackage/videodev DEPENDS:=@VIDEO_SUPPORT SUBMENU:=$(EMENU) KCONFIG:=$(CONFIG_VIDEO_DEV) - FILES:=$(MODULES_DIR)/kernel/drivers/media/video/*.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/drivers/media/video/*.$(LINUX_KMOD_SUFFIX) endef define KernelPackage/videodev/2.4 @@ -281,9 +293,101 @@ define KernelPackage/videodev/2.4 endef define KernelPackage/videodev/2.6 - AUTOLOAD:=$(call AutoLoad,60,v4l2-common v4l1-compat videodev) + 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 + DEFAULT:=y if LINUX_2_6_X86_Soekris + DEPENDS:=@LINUX_2_6_X86_Soekris + 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 + DEFAULT:=y if LINUX_2_6_X86_Soekris + DEPENDS:=@LINUX_2_6_X86_Soekris + 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 + DEFAULT:=y if LINUX_2_6_X86_Soekris + DEPENDS:=kmod-nsc-gpio @LINUX_2_6_X86_Soekris + 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 + DEFAULT:=y if LINUX_2_6_X86_Soekris + DEPENDS:=@LINUX_2_6_X86_Soekris + 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 + DEFAULT:=y if LINUX_2_6_X86_Soekris + 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 + DEFAULT:=y if LINUX_2_6_X86_Soekris + 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))