diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-22 08:18:04 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-01-22 08:18:04 +0000 |
| commit | d9dbb685437dd2637c62ae38409a22d22203d744 (patch) | |
| tree | a6fcbfe93d0bb7135dcf5dc274d09e4d41224111 /package/kernel/modules | |
| parent | 1bf76dc757de04d31e3f2efec35f62aee1f2de22 (diff) | |
[package] kernel: specify kmod packages dependencies in a uniform way
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19271 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/modules')
| -rw-r--r-- | package/kernel/modules/block.mk | 57 | ||||
| -rw-r--r-- | package/kernel/modules/crypto.mk | 60 | ||||
| -rw-r--r-- | package/kernel/modules/hwmon.mk | 21 | ||||
| -rw-r--r-- | package/kernel/modules/netfilter.mk | 83 | ||||
| -rw-r--r-- | package/kernel/modules/sound.mk | 18 | ||||
| -rw-r--r-- | package/kernel/modules/usb.mk | 131 | ||||
| -rw-r--r-- | package/kernel/modules/video.mk | 119 | ||||
| -rw-r--r-- | package/kernel/modules/w1.mk | 15 |
8 files changed, 246 insertions, 258 deletions
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index d6ad6a6a92..b1804337cd 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -19,10 +19,15 @@ endef $(eval $(call KernelPackage,ata-core)) -define KernelPackage/ata-ahci +define KernelPackage/ata/Depends SUBMENU:=$(BLOCK_MENU) + DEPENDS:=kmod-ata-core $(1) +endef + + +define KernelPackage/ata-ahci +$(call KernelPackage/ata/Depends,) TITLE:=AHCI Serial ATA support - DEPENDS:=kmod-ata-core KCONFIG:=CONFIG_SATA_AHCI FILES:=$(LINUX_DIR)/drivers/ata/ahci.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,ahci) @@ -36,9 +41,8 @@ $(eval $(call KernelPackage,ata-ahci)) define KernelPackage/ata-sil24 - SUBMENU:=$(BLOCK_MENU) +$(call KernelPackage/ata/Depends,) TITLE:=Silicon Image 3124/3132 SATA support - DEPENDS:=kmod-ata-core KCONFIG:=CONFIG_SATA_SIL24 FILES:=$(LINUX_DIR)/drivers/ata/sata_sil24.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,sata_sil24) @@ -52,9 +56,8 @@ $(eval $(call KernelPackage,ata-sil24)) define KernelPackage/ata-artop - SUBMENU:=$(BLOCK_MENU) +$(call KernelPackage/ata/Depends,) TITLE:=ARTOP 6210/6260 PATA support - DEPENDS:=kmod-ata-core KCONFIG:=CONFIG_PATA_ARTOP FILES:=$(LINUX_DIR)/drivers/ata/pata_artop.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,pata_artop) @@ -67,9 +70,8 @@ endef $(eval $(call KernelPackage,ata-artop)) define KernelPackage/ata-octeon-cf - SUBMENU:=$(BLOCK_MENU) +$(call KernelPackage/ata/Depends,@TARGET_octeon) TITLE:=Octeon Compact Flash support - DEPENDS:=kmod-ata-core @TARGET_octeon KCONFIG:=CONFIG_PATA_OCTEON_CF FILES:=$(LINUX_DIR)/drivers/ata/pata_octeon_cf.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,pata_octeon_cf) @@ -83,9 +85,8 @@ $(eval $(call KernelPackage,ata-octeon-cf)) define KernelPackage/ata-ixp4xx-cf - SUBMENU:=$(BLOCK_MENU) +$(call KernelPackage/ata/Depends,@TARGET_ixp4xx) TITLE:=IXP4XX Compact Flash support - DEPENDS:=kmod-ata-core @TARGET_ixp4xx KCONFIG:=CONFIG_PATA_IXP4XX_CF FILES:=$(LINUX_DIR)/drivers/ata/pata_ixp4xx_cf.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,pata_ixp4xx_cf) @@ -98,9 +99,8 @@ endef $(eval $(call KernelPackage,ata-ixp4xx-cf)) define KernelPackage/ata-rb532-cf - SUBMENU:=$(BLOCK_MENU) +$(call KernelPackage/ata/Depends,@TARGET_rb532 @BROKEN) TITLE:=RB532 Compact Flash support - DEPENDS:=@TARGET_rb532 kmod-ata-core @BROKEN KCONFIG:= \ CONFIG_PATA_PLATFORM \ CONFIG_PATA_RB532 @@ -117,9 +117,8 @@ endef $(eval $(call KernelPackage,ata-rb532-cf)) define KernelPackage/ata-nvidia-sata - SUBMENU:=$(BLOCK_MENU) +$(call KernelPackage/ata/Depends,) TITLE:=Nvidia Serial ATA support - DEPENDS:=kmod-ata-core KCONFIG:=CONFIG_SATA_NV FILES:=$(LINUX_DIR)/drivers/ata/sata_nv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,sata_nv) @@ -129,9 +128,8 @@ $(eval $(call KernelPackage,ata-nvidia-sata)) define KernelPackage/ata-magicbox-cf - SUBMENU:=$(BLOCK_MENU) +$(call KernelPackage/ata/Depends,@TARGET_ppc40x) TITLE:=Magicbox v2/OpenRB Compact flash support (ATA) - DEPENDS:=@TARGET_ppc40x +kmod-ata-core KCONFIG:=CONFIG_PATA_MAGICBOX_CF FILES:=$(LINUX_DIR)/drivers/ata/pata_magicbox_cf.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,pata_magicbox_cf) @@ -145,9 +143,8 @@ $(eval $(call KernelPackage,ata-magicbox-cf)) define KernelPackage/ata-piix - SUBMENU:=$(BLOCK_MENU) +$(call KernelPackage/ata/Depends,) TITLE:=Intel PIIX PATA/SATA support - DEPENDS:=kmod-ata-core KCONFIG:=CONFIG_ATA_PIIX FILES:=$(LINUX_DIR)/drivers/ata/ata_piix.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,ata_piix) @@ -162,9 +159,8 @@ $(eval $(call KernelPackage,ata-piix)) define KernelPackage/ata-via-sata - SUBMENU:=$(BLOCK_MENU) +$(call KernelPackage/ata/Depends,) TITLE:=VIA SATA support - DEPENDS:=kmod-ata-core KCONFIG:=CONFIG_SATA_VIA FILES:=$(LINUX_DIR)/drivers/ata/sata_via.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,41,sata_via) @@ -229,10 +225,15 @@ endef $(eval $(call KernelPackage,ide-core)) -define KernelPackage/ide-aec62xx +define KernelPackage/ide/Depends SUBMENU:=$(BLOCK_MENU) + DEPENDS:=kmod-ide-core $(1) +endef + + +define KernelPackage/ide-aec62xx +$(call KernelPackage/ide/Depends,@PCI_SUPPORT) TITLE:=Acard AEC62xx IDE driver - DEPENDS:=@PCI_SUPPORT +kmod-ide-core KCONFIG:=CONFIG_BLK_DEV_AEC62XX FILES:=$(LINUX_DIR)/drivers/ide/aec62xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,aec62xx) @@ -250,9 +251,8 @@ $(eval $(call KernelPackage,ide-aec62xx)) define KernelPackage/ide-magicbox - SUBMENU:=$(BLOCK_MENU) +$(call KernelPackage/ide/Depends,@TARGET_ppc40x) TITLE:=Magicbox v2/OpenRB Compact flash support (IDE) - DEPENDS:=@TARGET_ppc40x +kmod-ide-core KCONFIG:=CONFIG_BLK_DEV_IDE_MAGICBOX FILES:=$(LINUX_DIR)/drivers/ide/magicbox_ide.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,magicbox_ide) @@ -266,9 +266,8 @@ $(eval $(call KernelPackage,ide-magicbox)) define KernelPackage/ide-pdc202xx - SUBMENU:=$(BLOCK_MENU) +$(call KernelPackage/ide/Depends,@PCI_SUPPORT) TITLE:=Promise PDC202xx IDE driver - DEPENDS:=+kmod-ide-core KCONFIG:=CONFIG_BLK_DEV_PDC202XX_OLD FILES:=$(LINUX_DIR)/drivers/ide/pdc202xx_old.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,pdc202xx_old) @@ -287,9 +286,8 @@ $(eval $(call KernelPackage,ide-pdc202xx)) define KernelPackage/ide-it821x - SUBMENU:=$(BLOCK_MENU) +$(call KernelPackage/ide/Depends,@PCI_SUPPORT) TITLE:=ITE IT821x IDE driver - DEPENDS:=+kmod-ide-core KCONFIG:=CONFIG_BLK_DEV_IT821X FILES=$(LINUX_DIR)/drivers/ide/it821x.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,30,it821x) @@ -363,8 +361,7 @@ $(eval $(call KernelPackage,nbd)) define KernelPackage/pata-rb153-cf - SUBMENU:=$(BLOCK_MENU) - DEPENDS:=kmod-ata-core @TARGET_adm5120_router_le +$(call KernelPackage/ata/Depends,@TARGET_adm5120_router_le) TITLE:=RouterBOARD 153 CF Slot support KCONFIG:=CONFIG_PATA_RB153_CF FILES:=$(LINUX_DIR)/drivers/ata/pata_rb153_cf.$(LINUX_KMOD_SUFFIX) diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 1d0985b029..818a1d090c 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -56,10 +56,15 @@ endef $(eval $(call KernelPackage,crypto-core)) -define KernelPackage/crypto-hw-padlock +define KernelPackage/crypto/Depends SUBMENU:=$(CRYPTO_MENU) + DEPENDS:=kmod-crypto-core $(1) +endef + + +define KernelPackage/crypto-hw-padlock +$(call KernelPackage/crypto/Depends,) TITLE:=VIA PadLock ACE with AES/SHA hw crypto module - DEPENDS:=+kmod-crypto-core KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_PADLOCK \ @@ -75,9 +80,8 @@ $(eval $(call KernelPackage,crypto-hw-padlock)) define KernelPackage/crypto-hw-geode - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=AMD Geode hardware crypto module - DEPENDS:=+kmod-crypto-core KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_GEODE @@ -89,9 +93,8 @@ $(eval $(call KernelPackage,crypto-hw-geode)) define KernelPackage/crypto-hw-hifn-795x - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,+kmod-crypto-des @!TARGET_ubicom32) TITLE:=HIFN 795x crypto accelerator - DEPENDS:=+kmod-crypto-core +kmod-crypto-des @!TARGET_ubicom32 KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_HIFN_795X \ @@ -104,10 +107,8 @@ $(eval $(call KernelPackage,crypto-hw-hifn-795x)) define KernelPackage/crypto-hw-ixp4xx - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,@TARGET_ixp4xx +kmod-crypto-des +kmod-crypto-authenc) TITLE:=Intel IXP4xx hardware crypto module - DEPENDS:= \ - @TARGET_ixp4xx +kmod-crypto-core +kmod-crypto-des +kmod-crypto-authenc KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_IXP4XX @@ -123,10 +124,8 @@ $(eval $(call KernelPackage,crypto-hw-ixp4xx)) define KernelPackage/crypto-hw-ppc4xx - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,@TARGET_ppc40x||TARGET_ppc44x) TITLE:=AMCC PPC4xx hardware crypto module - DEPENDS:= \ - @TARGET_ppc40x||TARGET_ppc44x +kmod-crypto-core KCONFIG:= \ CONFIG_CRYPTO_HW=y \ CONFIG_CRYPTO_DEV_PPC4XX @@ -142,9 +141,8 @@ $(eval $(call KernelPackage,crypto-hw-ppc4xx)) define KernelPackage/crypto-aes - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=AES cipher CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_AES CONFIG_CRYPTO_AES_586 FILES:=$(LINUX_DIR)/crypto/aes$(AES_SUFFIX).$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,aes$(AES_SUFFIX)) @@ -159,9 +157,8 @@ $(eval $(call KernelPackage,crypto-aes)) define KernelPackage/crypto-arc4 - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=ARC4 (RC4) cipher CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_ARC4 FILES:=$(LINUX_DIR)/crypto/arc4.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,arc4) @@ -171,9 +168,8 @@ $(eval $(call KernelPackage,crypto-arc4)) define KernelPackage/crypto-authenc - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=Combined mode wrapper for IPsec - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_AUTHENC FILES:=$(LINUX_DIR)/crypto/authenc.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,authenc) @@ -182,9 +178,8 @@ endef $(eval $(call KernelPackage,crypto-authenc)) define KernelPackage/crypto-des - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=DES/3DES cipher CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_DES FILES:=$(LINUX_DIR)/crypto/des$(DES_SUFFIX).$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,des$(DES_SUFFIX)) @@ -194,9 +189,8 @@ $(eval $(call KernelPackage,crypto-des)) define KernelPackage/crypto-hmac - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=HMAC digest CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_HMAC FILES:=$(LINUX_DIR)/crypto/hmac.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,hmac) @@ -206,9 +200,8 @@ $(eval $(call KernelPackage,crypto-hmac)) define KernelPackage/crypto-md5 - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=MD5 digest CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_MD5 FILES:=$(LINUX_DIR)/crypto/md5.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,md5) @@ -218,9 +211,8 @@ $(eval $(call KernelPackage,crypto-md5)) define KernelPackage/crypto-michael-mic - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=Michael MIC keyed digest CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_MICHAEL_MIC FILES:=$(LINUX_DIR)/crypto/michael_mic.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,michael_mic) @@ -230,9 +222,8 @@ $(eval $(call KernelPackage,crypto-michael-mic)) define KernelPackage/crypto-sha1 - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=SHA1 digest CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_SHA1 FILES:=$(LINUX_DIR)/crypto/sha1$(SHA1_SUFFIX).$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,sha1$(SHA1_SUFFIX)) @@ -242,9 +233,8 @@ $(eval $(call KernelPackage,crypto-sha1)) define KernelPackage/crypto-misc - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=Other CryptoAPI modules - DEPENDS:=+kmod-crypto-core KCONFIG:= \ CONFIG_CRYPTO_ANUBIS \ CONFIG_CRYPTO_BLOWFISH \ @@ -288,10 +278,10 @@ endef $(eval $(call KernelPackage,crypto-misc)) + define KernelPackage/crypto-ocf - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,@!TARGET_uml) TITLE:=OCF modules - DEPENDS:=+kmod-crypto-core @!TARGET_uml KCONFIG:= \ CONFIG_OCF_OCF \ CONFIG_OCF_CRYPTODEV \ @@ -313,9 +303,8 @@ $(eval $(call KernelPackage,crypto-ocf)) define KernelPackage/crypto-null - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=Null CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_NULL FILES:=$(LINUX_DIR)/crypto/crypto_null.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,09,crypto_null) @@ -325,9 +314,8 @@ $(eval $(call KernelPackage,crypto-null)) define KernelPackage/crypto-test - SUBMENU:=$(CRYPTO_MENU) +$(call KernelPackage/crypto/Depends,) TITLE:=Test CryptoAPI module - DEPENDS:=+kmod-crypto-core KCONFIG:=CONFIG_CRYPTO_TEST FILES:=$(LINUX_DIR)/crypto/tcrypt.$(LINUX_KMOD_SUFFIX) endef diff --git a/package/kernel/modules/hwmon.mk b/package/kernel/modules/hwmon.mk index f259a7af93..d50fd3ea58 100644 --- a/package/kernel/modules/hwmon.mk +++ b/package/kernel/modules/hwmon.mk @@ -26,10 +26,15 @@ endef $(eval $(call KernelPackage,hwmon-core)) -define KernelPackage/hwmon-lm75 +define KernelPackage/hwmon/Depends SUBMENU:=$(HWMON_MENU) + DEPENDS:=kmod-hwmon-core $(1) +endef + + +define KernelPackage/hwmon-lm75 +$(call KernelPackage/hwmon/Depends,+kmod-i2c-core) TITLE:=LM75 monitoring support - DEPENDS:=kmod-hwmon-core +kmod-i2c-core KCONFIG:=CONFIG_SENSORS_LM75 FILES:=$(LINUX_DIR)/drivers/hwmon/lm75.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,lm75) @@ -43,9 +48,8 @@ $(eval $(call KernelPackage,hwmon-lm75)) define KernelPackage/hwmon-lm77 - SUBMENU:=$(HWMON_MENU) +$(call KernelPackage/hwmon/Depends,+kmod-i2c-core) TITLE:=LM77 monitoring support - DEPENDS:=kmod-hwmon-core +kmod-i2c-core KCONFIG:=CONFIG_SENSORS_LM77 FILES:=$(LINUX_DIR)/drivers/hwmon/lm77.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,lm77) @@ -58,9 +62,8 @@ endef $(eval $(call KernelPackage,hwmon-lm77)) define KernelPackage/hwmon-lm90 - SUBMENU:=$(HWMON_MENU) +$(call KernelPackage/hwmon/Depends,+kmod-i2c-core) TITLE:=LM90 monitoring support - DEPENDS:=kmod-hwmon-core +kmod-i2c-core KCONFIG:=CONFIG_SENSORS_LM90 FILES:=$(LINUX_DIR)/drivers/hwmon/lm90.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,60,lm90) @@ -73,9 +76,8 @@ endef $(eval $(call KernelPackage,hwmon-lm90)) define KernelPackage/hwmon-pc87360 - SUBMENU:=$(HWMON_MENU) +$(call KernelPackage/hwmon/Depends,@TARGET_x86) TITLE:=PC87360 monitoring support - DEPENDS:=kmod-hwmon-core @TARGET_x86 KCONFIG:= \ CONFIG_SENSORS_PC87360 \ CONFIG_HWMON_VID @@ -92,9 +94,8 @@ endef $(eval $(call KernelPackage,hwmon-pc87360)) define KernelPackage/hwmon-w83627hf - SUBMENU:=$(HWMON_MENU) +$(call KernelPackage/hwmon/Depends,@TARGET_rdc||TARGET_x86) TITLE:=Winbond W83627HF monitoring support - DEPENDS:=kmod-hwmon-core @TARGET_x86||TARGET_rdc KCONFIG:= \ CONFIG_SENSORS_W83627HF \ CONFIG_HWMON_VID diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index 1b4c6922aa..c8f8b1381d 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -32,13 +32,18 @@ endef $(eval $(call KernelPackage,ipt-core)) -define KernelPackage/ipt-conntrack +define KernelPackage/ipt/Depends SUBMENU:=$(NF_MENU) + DEPENDS:= kmod-ipt-core $(1) +endef + + +define KernelPackage/ipt-conntrack +$(call KernelPackage/ipt/Depends,) TITLE:=Basic connection tracking modules KCONFIG:=$(KCONFIG_IPT_CONNTRACK) FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,41,$(notdir $(IPT_CONNTRACK-m))) - DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-conntrack/description @@ -51,12 +56,11 @@ $(eval $(call KernelPackage,ipt-conntrack)) define KernelPackage/ipt-conntrack-extra - SUBMENU:=$(NF_MENU) +$(call KernelPackage/ipt/Depends,+kmod-ipt-conntrack) TITLE:=Extra connection tracking modules KCONFIG:=$(KCONFIG_IPT_CONNTRACK_EXTRA) FILES:=$(foreach mod,$(IPT_CONNTRACK_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_CONNTRACK_EXTRA-m))) - DEPENDS:= kmod-ipt-core +kmod-ipt-conntrack endef define KernelPackage/ipt-conntrack-extra/description @@ -74,12 +78,11 @@ $(eval $(call KernelPackage,ipt-conntrack-extra)) define KernelPackage/ipt-filter - SUBMENU:=$(NF_MENU) +$(call KernelPackage/ipt/Depends,+LINUX_2_6:kmod-textsearch) TITLE:=Modules for packet content inspection KCONFIG:=$(KCONFIG_IPT_FILTER) FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_FILTER-m))) - DEPENDS:=kmod-ipt-core +LINUX_2_6:kmod-textsearch endef define KernelPackage/ipt-filter/description @@ -93,12 +96,11 @@ $(eval $(call KernelPackage,ipt-filter)) define KernelPackage/ipt-ipopt - SUBMENU:=$(NF_MENU) +$(call KernelPackage/ipt/Depends,) TITLE:=Modules for matching/changing IP packet options KCONFIG:=$(KCONFIG_IPT_IPOPT) FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPOPT-m))) - DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-ipopt/description @@ -118,12 +120,11 @@ $(eval $(call KernelPackage,ipt-ipopt)) define KernelPackage/ipt-ipsec - SUBMENU:=$(NF_MENU) +$(call KernelPackage/ipt/Depends,) TITLE:=Modules for matching IPSec packets KCONFIG:=$(KCONFIG_IPT_IPSEC) FILES:=$(foreach mod,$(IPT_IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPSEC-m))) - DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-ipsec/description @@ -137,12 +138,11 @@ $(eval $(call KernelPackage,ipt-ipsec)) define KernelPackage/ipt-nat - SUBMENU:=$(NF_MENU) +$(call KernelPackage/ipt/Depends,+kmod-ipt-conntrack) TITLE:=Basic NAT targets KCONFIG:=$(KCONFIG_IPT_NAT) FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_NAT-m))) - DEPENDS:= kmod-ipt-core +kmod-ipt-conntrack endef define KernelPackage/ipt-nat/description @@ -155,12 +155,11 @@ $(eval $(call KernelPackage,ipt-nat)) define KernelPackage/ipt-nat-extra - SUBMENU:=$(NF_MENU) +$(call KernelPackage/ipt/Depends,+kmod-ipt-nat) TITLE:=Extra NAT targets KCONFIG:=$(KCONFIG_IPT_NAT_EXTRA) FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,43,$(notdir $(IPT_NAT_EXTRA-m))) - DEPENDS:= kmod-ipt-core +kmod-ipt-nat endef define KernelPackage/ipt-nat-extra/description @@ -175,12 +174,11 @@ $(eval $(call KernelPackage,ipt-nat-extra)) define KernelPackage/ipt-nathelper - SUBMENU:=$(NF_MENU) +$(call KernelPackage/ipt/Depends,+kmod-ipt-nat) TITLE:=Basic Conntrack and NAT helpers KCONFIG:=$(KCONFIG_IPT_NATHELPER) FILES:=$(foreach mod,$(IPT_NATHELPER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER-m))) - DEPENDS:= kmod-ipt-core +kmod-ipt-nat endef define KernelPackage/ipt-nathelper/description @@ -198,12 +196,11 @@ $(eval $(call KernelPackage,ipt-nathelper)) define KernelPackage/ipt-nathelper-extra - SUBMENU:=$(NF_MENU) +$(call KernelPackage/ipt/Depends,+kmod-ipt-nat +LINUX_2_6:kmod-textsearch) TITLE:=Extra Conntrack and NAT helpers KCONFIG:=$(KCONFIG_IPT_NATHELPER_EXTRA) FILES:=$(foreach mod,$(IPT_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER_EXTRA-m))) - DEPENDS:= kmod-ipt-core +kmod-ipt-nat +LINUX_2_6:kmod-textsearch endef define KernelPackage/ipt-nathelper-extra/description @@ -223,7 +220,7 @@ $(eval $(call KernelPackage,ipt-nathelper-extra)) define KernelPackage/ipt-imq - SUBMENU:=$(NF_MENU) +$(call KernelPackage/ipt/Depends,) TITLE:=Intermediate Queueing support KCONFIG:= \ CONFIG_IMQ \ @@ -237,7 +234,6 @@ define KernelPackage/ipt-imq imq \ $(IPT_IMQ-m) \ )) - DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-imq/description @@ -248,12 +244,11 @@ $(eval $(call KernelPackage,ipt-imq)) define KernelPackage/ipt-queue - SUBMENU:=$(NF_MENU) +$(call KernelPackage/ipt/Depends,) TITLE:=Module for user-space packet queueing KCONFIG:=$(KCONFIG_IPT_QUEUE) FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_QUEUE-m))) - DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-queue/description @@ -266,12 +261,11 @@ $(eval $(call KernelPackage,ipt-queue)) define KernelPackage/ipt-ulog - SUBMENU:=$(NF_MENU) +$(call KernelPackage/ipt/Depends,) TITLE:=Module for user-space packet logging KCONFIG:=$(KCONFIG_IPT_ULOG) FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_ULOG-m))) - DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-ulog/description @@ -284,12 +278,11 @@ $(eval $(call KernelPackage,ipt-ulog)) define KernelPackage/ipt-iprange - SUBMENU:=$(NF_MENU) +$(call KernelPackage/ipt/Depends,) TITLE:=Module for matching ip ranges KCONFIG:=$(KCONFIG_IPT_IPRANGE) FILES:=$(foreach mod,$(IPT_IPRANGE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPRANGE-m))) - DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-iprange/description @@ -302,12 +295,11 @@ $(eval $(call KernelPackage,ipt-iprange)) define KernelPackage/ipt-extra - SUBMENU:=$(NF_MENU) +$(call KernelPackage/ipt/Depends,) TITLE:=Extra modules KCONFIG:=$(KCONFIG_IPT_EXTRA) FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_EXTRA-m))) - DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-extra/description @@ -356,6 +348,7 @@ endef $(eval $(call KernelPackage,arptables)) + define KernelPackage/ebtables SUBMENU:=$(NF_MENU) TITLE:=Bridge firewalling modules @@ -374,10 +367,16 @@ endef $(eval $(call KernelPackage,ebtables)) -define KernelPackage/ebtables-ipv4 + +define KernelPackage/ebtables/Depends SUBMENU:=$(NF_MENU) + DEPENDS:=kmod-ebtables $(1) +endef + + +define KernelPackage/ebtables-ipv4 +$(call KernelPackage/ebtables/Depends,) TITLE:=ebtables: IPv4 support - DEPENDS:= kmod-ebtables FILES:=$(foreach mod,$(EBTABLES_IP4-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) KCONFIG:=$(KCONFIG_EBTABLES_IP4) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_IP4-m))) @@ -390,10 +389,10 @@ endef $(eval $(call KernelPackage,ebtables-ipv4)) + define KernelPackage/ebtables-ipv6 - SUBMENU:=$(NF_MENU) +$(call KernelPackage/ebtables/Depends,) TITLE:=ebtables: IPv6 support - DEPENDS:= kmod-ebtables FILES:=$(foreach mod,$(EBTABLES_IP6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) KCONFIG:=$(KCONFIG_EBTABLES_IP6) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_IP6-m))) @@ -406,10 +405,10 @@ endef $(eval $(call KernelPackage,ebtables-ipv6)) + define KernelPackage/ebtables-watchers - SUBMENU:=$(NF_MENU) +$(call KernelPackage/ebtables/Depends,) TITLE:=ebtables: watchers support - DEPENDS:= kmod-ebtables FILES:=$(foreach mod,$(EBTABLES_WATCHERS-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) KCONFIG:=$(KCONFIG_EBTABLES_WATCHERS) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_WATCHERS-m))) @@ -422,6 +421,7 @@ endef $(eval $(call KernelPackage,ebtables-watchers)) + define KernelPackage/nfnetlink SUBMENU:=$(NF_MENU) TITLE:=Netlink-based userspace interface @@ -438,10 +438,15 @@ endef $(eval $(call KernelPackage,nfnetlink)) -define KernelPackage/nfnetlink-log +define KernelPackage/nfnetlink/Depends SUBMENU:=$(NF_MENU) + DEPENDS:=@LINUX_2_6 +kmod-nfnetlink $(1) +endef + + +define KernelPackage/nfnetlink-log +$(call KernelPackage/nfnetlink/Depends,) TITLE:=Netfilter LOG over NFNETLINK interface - DEPENDS:=@LINUX_2_6 +kmod-nfnetlink FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_log.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_NETFILTER_NETLINK_LOG AUTOLOAD:=$(call AutoLoad,48,nfnetlink_log) @@ -455,9 +460,8 @@ $(eval $(call KernelPackage,nfnetlink-log)) define KernelPackage/nfnetlink-queue - SUBMENU:=$(NF_MENU) +$(call KernelPackage/nfnetlink/Depends,) TITLE:=Netfilter QUEUE over NFNETLINK interface - DEPENDS:=@LINUX_2_6 +kmod-nfnetlink FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_queue.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_NETFILTER_NETLINK_QUEUE AUTOLOAD:=$(call AutoLoad,48,nfnetlink_queue) @@ -471,9 +475,8 @@ $(eval $(call KernelPackage,nfnetlink-queue)) define KernelPackage/nf-conntrack-netlink - SUBMENU:=$(NF_MENU) +$(call KernelPackage/nfnetlink/Depends,+kmod-ipt-conntrack) TITLE:=Connection tracking netlink interface - DEPENDS:=@LINUX_2_6 +kmod-nfnetlink +kmod-ipt-conntrack FILES:=$(LINUX_DIR)/net/netfilter/nf_conntrack_netlink.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_NF_CT_NETLINK AUTOLOAD:=$(call AutoLoad,49,nf_conntrack_netlink) diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk index 0e7cefe569..9350dbf344 100644 --- a/package/kernel/modules/sound.mk +++ b/package/kernel/modules/sound.mk @@ -76,10 +76,16 @@ endef $(eval $(call KernelPackage,sound-core)) -define KernelPackage/sound-i8x0 + +define KernelPackage/sound/Depends SUBMENU:=$(SOUND_MENU) + DEPENDS:=kmod-sound-core $(1) +endef + + +define KernelPackage/sound-i8x0 +$(call KernelPackage/sound/Depends,@!TARGET_uml) TITLE:=Intel/SiS/nVidia/AMD/ALi AC97 Controller - DEPENDS:=kmod-sound-core @!TARGET_uml KCONFIG:=CONFIG_SND_INTEL8X0 FILES:=$(LINUX_DIR)/sound/pci/snd-intel8x0.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,35,snd-i8x0) @@ -93,10 +99,10 @@ endef $(eval $(call KernelPackage,sound-i8x0)) + define KernelPackage/sound-ps3 - SUBMENU:=$(SOUND_MENU) +$(call KernelPackage/sound/Depends,@TARGET_ps3||TARGET_ps3chk) TITLE:=PS3 Audio - DEPENDS:=kmod-sound-core @TARGET_ps3||@TARGET_ps3chk KCONFIG:=CONFIG_SND_PS3 \ CONFIG_SND_PPC=y \ CONFIG_SND_PS3_DEFAULT_START_DELAY=2000 @@ -110,10 +116,10 @@ endef $(eval $(call KernelPackage,sound-ps3)) + define KernelPackage/sound-cs5535audio - SUBMENU:=$(SOUND_MENU) +$(call KernelPackage/sound/Depends,@!TARGET_uml) TITLE:=CS5535 PCI Controller - DEPENDS:=kmod-sound-core @!TARGET_uml KCONFIG:=CONFIG_SND_CS5535AUDIO FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/sound/ac97_bus.$(LINUX_KMOD_SUFFIX) \ diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 2aaed3ca5a..08935d14a4 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -7,26 +7,14 @@ USB_MENU:=USB Support -ifeq ($(KERNEL),2.4) +ifneq ($(CONFIG_LINUX_2_4),) USBNET_DIR:=usb/net endif -ifeq ($(KERNEL_PATCHVER),2.6.21) - USBNET_DIR:=usb/net - USBHID_DIR:=usb/input - USBINPUT_DIR:=usb/input -endif - USBNET_DIR?=net/usb USBHID_DIR?=hid/usbhid USBINPUT_DIR?=input/misc -define usbdep - SUBMENU:=$(USB_MENU) - DEPENDS:=kmod-usb-core $(1) -endef - - define KernelPackage/usb-core SUBMENU:=$(USB_MENU) TITLE:=Support for USB @@ -50,8 +38,14 @@ endef $(eval $(call KernelPackage,usb-core)) +define KernelPackage/usb/Depends + SUBMENU:=$(USB_MENU) + DEPENDS:=kmod-usb-core $(1) +endef + + define KernelPackage/usb-uhci - $(call usbdep,) +$(call KernelPackage/usb/Depends,) TITLE:=Support for UHCI controllers KCONFIG:= \ CONFIG_USB_UHCI_ALT \ @@ -78,7 +72,7 @@ $(eval $(call KernelPackage,usb-uhci)) define KernelPackage/usb-uhci-iv - $(call usbdep,@LINUX_2_4) +$(call KernelPackage/usb/Depends,@LINUX_2_4) TITLE:=Support for Intel/VIA UHCI controllers KCONFIG:=CONFIG_USB_UHCI FILES:=$(LINUX_DIR)/drivers/usb/host/usb-uhci.$(LINUX_KMOD_SUFFIX) @@ -93,7 +87,7 @@ $(eval $(call KernelPackage,usb-uhci-iv)) define KernelPackage/usb-ohci - $(call usbdep,) +$(call KernelPackage/usb/Depends,) TITLE:=Support for OHCI controllers KCONFIG:= \ CONFIG_USB_OHCI \ @@ -121,7 +115,7 @@ $(eval $(call KernelPackage,usb-ohci)) define KernelPackage/usb-adm5120 - $(call usbdep,@TARGET_adm5120_router_be||@TARGET_adm5120_router_le) +$(call KernelPackage/usb/Depends,@TARGET_adm5120_router_be||@TARGET_adm5120_router_le) TITLE:=Support for the ADM5120 HCD controller KCONFIG:=CONFIG_USB_ADM5120_HCD FILES:=$(LINUX_DIR)/drivers/usb/host/adm5120-hcd.$(LINUX_KMOD_SUFFIX) @@ -135,7 +129,7 @@ endef $(eval $(call KernelPackage,usb-adm5120)) define KernelPackage/usb-etrax - $(call usbdep,@TARGET_etrax) +$(call KernelPackage/usb/Depends,@TARGET_etrax) TITLE:=Support for the ETRAX USB host controller KCONFIG:=CONFIG_ETRAX_USB_HOST \ CONFIG_ETRAX_USB_HOST_PORT1=y CONFIG_ETRAX_USB_HOST_PORT2=y @@ -150,7 +144,7 @@ endef $(eval $(call KernelPackage,usb-etrax)) define KernelPackage/usb-octeon - $(call usbdep,@TARGET_octeon) +$(call KernelPackage/usb/Depends,@TARGET_octeon) TITLE:=Support for the Octeon USB OTG controller KCONFIG:=CONFIG_USB_DWC_OTG FILES:=$(LINUX_DIR)/drivers/usb/host/dwc_otg/dwc_otg.$(LINUX_KMOD_SUFFIX) @@ -165,7 +159,7 @@ $(eval $(call KernelPackage,usb-octeon)) define KernelPackage/usb2 - $(call usbdep,) +$(call KernelPackage/usb/Depends,) TITLE:=Support for USB2 controllers KCONFIG:=CONFIG_USB_EHCI_HCD \ CONFIG_USB_EHCI_AR71XX=y @@ -181,7 +175,7 @@ $(eval $(call KernelPackage,usb2)) define KernelPackage/usb-acm - $(call usbdep,) +$(call KernelPackage/usb/Depends,) TITLE:=Support for modems/isdn controllers KCONFIG:=CONFIG_USB_ACM endef @@ -204,7 +198,7 @@ $(eval $(call KernelPackage,usb-acm)) define KernelPackage/usb-audio - $(call usbdep,+kmod-sound-core) +$(call KernelPackage/usb/Depends,+kmod-sound-core) TITLE:=Support for USB audio devices KCONFIG:= \ CONFIG_USB_AUDIO \ @@ -233,7 +227,7 @@ $(eval $(call KernelPackage,usb-audio)) define KernelPackage/usb-printer - $(call usbdep,) +$(call KernelPackage/usb/Depends,) TITLE:=Support for printers KCONFIG:=CONFIG_USB_PRINTER endef @@ -256,7 +250,7 @@ $(eval $(call KernelPackage,usb-printer)) define KernelPackage/usb-serial - $(call usbdep,) +$(call KernelPackage/usb/Depends,) TITLE:=Support for USB-to-Serial converters KCONFIG:=CONFIG_USB_SERIAL FILES:=$(LINUX_DIR)/drivers/usb/serial/usbserial.$(LINUX_KMOD_SUFFIX) @@ -270,8 +264,14 @@ endef $(eval $(call KernelPackage,usb-serial)) +define KernelPackage/usb-serial/Depends + SUBMENU:=$(USB_MENU) + DEPENDS:=kmod-usb-serial $(1) +endef + + define KernelPackage/usb-serial-airprime - $(call usbdep,kmod-usb-serial @LINUX_2_6) +$(call KernelPackage/usb-serial/Depends,@LINUX_2_6) TITLE:=Support for Airprime (EVDO) KCONFIG:=CONFIG_USB_SERIAL_AIRPRIME FILES:=$(LINUX_DIR)/drivers/usb/serial/airprime.$(LINUX_KMOD_SUFFIX) @@ -286,7 +286,7 @@ $(eval $(call KernelPackage,usb-serial-airprime)) define KernelPackage/usb-serial-belkin - $(call usbdep,kmod-usb-serial) +$(call KernelPackage/usb-serial/Depends,) TITLE:=Support for Belkin devices KCONFIG:=CONFIG_USB_SERIAL_BELKIN FILES:=$(LINUX_DIR)/drivers/usb/serial/belkin_sa.$(LINUX_KMOD_SUFFIX) @@ -301,7 +301,7 @@ $(eval $(call KernelPackage,usb-serial-belkin)) define KernelPackage/usb-serial-ch341 - $(call usbdep,kmod-usb-serial @LINUX_2_6) +$(call KernelPackage/usb-serial/Depends,@LINUX_2_6) TITLE:=Support for CH341 devices KCONFIG:=CONFIG_USB_SERIAL_CH341 FILES:=$(LINUX_DIR)/drivers/usb/serial/ch341.$(LINUX_KMOD_SUFFIX) @@ -316,7 +316,7 @@ $(eval $(call KernelPackage,usb-serial-ch341)) define KernelPackage/usb-serial-ftdi - $(call usbdep,kmod-usb-serial) +$(call KernelPackage/usb-serial/Depends,) TITLE:=Support for FTDI devices KCONFIG:=CONFIG_USB_SERIAL_FTDI_SIO FILES:=$(LINUX_DIR)/drivers/usb/serial/ftdi_sio.$(LINUX_KMOD_SUFFIX) @@ -331,7 +331,7 @@ $(eval $(call KernelPackage,usb-serial-ftdi)) define KernelPackage/usb-serial-mct - $(call usbdep,kmod-usb-serial) +$(call KernelPackage/usb-serial/Depends,) TITLE:=Support for Magic Control Tech. devices KCONFIG:=CONFIG_USB_SERIAL_MCT_U232 FILES:=$(LINUX_DIR)/drivers/usb/serial/mct_u232.$(LINUX_KMOD_SUFFIX) @@ -346,7 +346,7 @@ $(eval $(call KernelPackage,usb-serial-mct)) define KernelPackage/usb-serial-pl2303 - $(call usbdep,kmod-usb-serial) +$(call KernelPackage/usb-serial/Depends,) TITLE:=Support for Prolific PL2303 devices KCONFIG:=CONFIG_USB_SERIAL_PL2303 FILES:=$(LINUX_DIR)/drivers/usb/serial/pl2303.$(LINUX_KMOD_SUFFIX) @@ -361,7 +361,7 @@ $(eval $(call KernelPackage,usb-serial-pl2303)) define KernelPackage/usb-serial-cp2101 - $(call usbdep,kmod-usb-serial) +$(call KernelPackage/usb-serial/Depends,) TITLE:=Support for Silicon Labs cp2101 devices KCONFIG:=CONFIG_USB_SERIAL_CP2101 FILES:=$(LINUX_DIR)/drivers/usb/serial/cp2101.$(LINUX_KMOD_SUFFIX) @@ -376,7 +376,7 @@ $(eval $(call KernelPackage,usb-serial-cp2101)) define KernelPackage/usb-serial-ark3116 - $(call usbdep,kmod-usb-serial @LINUX_2_6) +$(call KernelPackage/usb-serial/Depends,@LINUX_2_6) TITLE:=Support for ArkMicroChips ARK3116 devices KCONFIG:=CONFIG_USB_SERIAL_ARK3116 FILES:=$(LINUX_DIR)/drivers/usb/serial/ark3116.$(LINUX_KMOD_SUFFIX) @@ -391,7 +391,7 @@ $(eval $(call KernelPackage,usb-serial-ark3116)) define KernelPackage/usb-serial-oti6858 - $(call usbdep,kmod-usb-serial @LINUX_2_6) +$(call KernelPackage/usb-serial/Depends,@LINUX_2_6) TITLE:=Support for Ours Technology OTI6858 devices KCONFIG:=CONFIG_USB_SERIAL_OTI6858 FILES:=$(LINUX_DIR)/drivers/usb/serial/oti6858.$(LINUX_KMOD_SUFFIX) @@ -406,7 +406,7 @@ $(eval $(call KernelPackage,usb-serial-oti6858)) define KernelPackage/usb-serial-sierrawireless - $(call usbdep,kmod-usb-serial) +$(call KernelPackage/usb-serial/Depends,) TITLE:=Support for Sierra Wireless devices KCONFIG:=CONFIG_USB_SERIAL_SIERRAWIRELESS FILES:=$(LINUX_DIR)/drivers/usb/serial/sierra.$(LINUX_KMOD_SUFFIX) @@ -421,7 +421,7 @@ $(eval $(call KernelPackage,usb-serial-sierrawireless)) define KernelPackage/usb-serial-motorola-phone - $(call usbdep,kmod-usb-serial) +$(call KernelPackage/usb-serial/Depends,) TITLE:=Support for Motorola usb phone KCONFIG:=CONFIG_USB_SERIAL_MOTOROLA FILES:=$(LINUX_DIR)/drivers/usb/serial/moto_modem.$(LINUX_KMOD_SUFFIX) @@ -437,7 +437,7 @@ $(eval $(call KernelPackage,usb-serial-motorola-phone)) define KernelPackage/usb-serial-visor - $(call usbdep,kmod-usb-serial) +$(call KernelPackage/usb-serial/Depends,) TITLE:=Support for Handspring Visor devices KCONFIG:=CONFIG_USB_SERIAL_VISOR FILES:=$(LINUX_DIR)/drivers/usb/serial/visor.$(LINUX_KMOD_SUFFIX) @@ -452,7 +452,7 @@ $(eval $(call KernelPackage,usb-serial-visor)) define KernelPackage/usb-serial-keyspan - $(call usbdep,kmod-usb-serial) +$(call KernelPackage/usb-serial/Depends,) TITLE:=Support for Keyspan USB-to-Serial devices KCONFIG:= \ CONFIG_USB_SERIAL_KEYSPAN \ @@ -480,7 +480,7 @@ $(eval $(call KernelPackage,usb-serial-keyspan)) define KernelPackage/usb-serial-option - $(call usbdep,kmod-usb-serial @LINUX_2_6) +$(call KernelPackage/usb-serial/Depends,@LINUX_2_6) TITLE:=Support for Option HSDPA modems KCONFIG:=CONFIG_USB_SERIAL_OPTION FILES:=$(LINUX_DIR)/drivers/usb/serial/option.$(LINUX_KMOD_SUFFIX) @@ -495,7 +495,7 @@ $(eval $(call KernelPackage,usb-serial-option)) define KernelPackage/usb-storage - $(call usbdep,+kmod-scsi-core) +$(call KernelPackage/usb/Depends,+kmod-scsi-core) TITLE:=USB Storage support KCONFIG:=CONFIG_USB_STORAGE FILES:=$(LINUX_DIR)/drivers/usb/storage/usb-storage.$(LINUX_KMOD_SUFFIX) @@ -510,7 +510,7 @@ $(eval $(call KernelPackage,usb-storage)) define KernelPackage/usb-video - $(call usbdep,@LINUX_2_6) +$(call KernelPackage/usb/Depends,@LINUX_2_6) TITLE:=Support for USB video devices KCONFIG:=CONFIG_VIDEO_USBVIDEO FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/usbvideo.$(LINUX_KMOD_SUFFIX) @@ -525,7 +525,7 @@ $(eval $(call KernelPackage,usb-video)) define KernelPackage/usb-atm - $(call usbdep,@LINUX_2_6 +kmod-atm) +$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-atm) TITLE:=Support for ATM on USB bus KCONFIG:=CONFIG_USB_ATM FILES:=$(LINUX_DIR)/drivers/usb/atm/usbatm.$(LINUX_KMOD_SUFFIX) @@ -539,8 +539,14 @@ endef $(eval $(call KernelPackage,usb-atm)) +define KernelPackage/usb-atm/Depends + SUBMENU:=$(USB_MENU) + DEPENDS:=kmod-usb-atm $(1) +endef + + define KernelPackage/usb-atm-speedtouch - $(call usbdep,kmod-usb-atm @LINUX_2_6) +$(call KernelPackage/usb-atm/Depends,@LINUX_2_6) TITLE:=SpeedTouch USB ADSL modems support KCONFIG:=CONFIG_USB_SPEEDTOUCH FILES:=$(LINUX_DIR)/drivers/usb/atm/speedtch.$(LINUX_KMOD_SUFFIX) @@ -555,7 +561,7 @@ $(eval $(call KernelPackage,usb-atm-speedtouch)) define KernelPackage/usb-atm-ueagle - $(call usbdep,kmod-usb-atm @LINUX_2_6) +$(call KernelPackage/usb-atm/Depends,@LINUX_2_6) TITLE:=Eagle 8051 based USB ADSL modems support FILES:=$(LINUX_DIR)/drivers/usb/atm/ueagle-atm.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_USB_UEAGLEATM @@ -568,8 +574,9 @@ endef $(eval $(call KernelPackage,usb-atm-ueagle)) + define KernelPackage/usb-atm-cxacru - $(call usbdep,kmod-usb-atm @LINUX_2_6) +$(call KernelPackage/usb-atm/Depends,@LINUX_2_6) TITLE:=cxacru FILES:=$(LINUX_DIR)/drivers/usb/atm/cxacru.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_USB_CXACRU @@ -584,7 +591,7 @@ $(eval $(call KernelPackage,usb-atm-cxacru)) define KernelPackage/usb-net - $(call usbdep,) +$(call KernelPackage/usb/Depends,) TITLE:=Kernel modules for USB-to-Ethernet convertors KCONFIG:=CONFIG_USB_USBNET AUTOLOAD:=$(call AutoLoad,60,usbnet) @@ -605,8 +612,14 @@ endef $(eval $(call KernelPackage,usb-net)) +define KernelPackage/usb-net/Depends + SUBMENU:=$(USB_MENU) + DEPENDS:=kmod-usb-net $(1) +endef + + define KernelPackage/usb-net-asix - $(call usbdep,kmod-usb-net @LINUX_2_6) +$(call KernelPackage/usb-net/Depends,@LINUX_2_6) TITLE:=Kernel module for USB-to-Ethernet Asix convertors KCONFIG:=CONFIG_USB_NET_AX8817X FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/asix.$(LINUX_KMOD_SUFFIX) @@ -621,7 +634,7 @@ $(eval $(call KernelPackage,usb-net-asix)) define KernelPackage/usb-net-hso - $(call usbdep,kmod-usb-net @LINUX_2_6 @!LINUX_2_6_21 @!LINUX_2_6_25 +!TARGET_rb532||!TARGET_avr32||!TARGET_brcm47xx||!TARGET_s3c24xx||!TARGET_ifxmips||!TARGET_atheros||!TARGET_adm5120||!TARGET_ar7||!TARGET_ppc40x||!TARGET_ixp4xx||!TARGET_rdc:kmod-rfkill) +$(call KernelPackage/usb-net/Depends,@LINUX_2_6 @!LINUX_2_6_21 @!LINUX_2_6_25 +!TARGET_rb532||!TARGET_avr32||!TARGET_brcm47xx||!TARGET_s3c24xx||!TARGET_ifxmips||!TARGET_atheros||!TARGET_adm5120||!TARGET_ar7||!TARGET_ppc40x||!TARGET_ixp4xx||!TARGET_rdc:kmod-rfkill) TITLE:=Kernel module for Option USB High Speed Mobile Devices KCONFIG:=CONFIG_USB_HSO FILES:= \ @@ -637,7 +650,7 @@ $(eval $(call KernelPackage,usb-net-hso)) define KernelPackage/usb-net-kaweth - $(call usbdep,kmod-usb-net @LINUX_2_6) +$(call KernelPackage/usb-net/Depends,@LINUX_2_6) TITLE:=Kernel module for USB-to-Ethernet Kaweth convertors KCONFIG:=CONFIG_USB_KAWETH FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/kaweth.$(LINUX_KMOD_SUFFIX) @@ -652,7 +665,7 @@ $(eval $(call KernelPackage,usb-net-kaweth)) define KernelPackage/usb-net-pegasus - $(call usbdep,kmod-usb-net @LINUX_2_6) +$(call KernelPackage/usb-net/Depends,@LINUX_2_6) TITLE:=Kernel module for USB-to-Ethernet Pegasus convertors KCONFIG:=CONFIG_USB_PEGASUS FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/pegasus.$(LINUX_KMOD_SUFFIX) @@ -667,7 +680,7 @@ $(eval $(call KernelPackage,usb-net-pegasus)) define KernelPackage/usb-net-mcs7830 - $(call usbdep,kmod-usb-net @LINUX_2_6) +$(call KernelPackage/usb-net/Depends,@LINUX_2_6) TITLE:=Kernel module for USB-to-Ethernet MCS7830 convertors KCONFIG:=CONFIG_USB_NET_MCS7830 FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/mcs7830.$(LINUX_KMOD_SUFFIX) @@ -680,8 +693,9 @@ endef $(eval $(call KernelPackage,usb-net-mcs7830)) + define KernelPackage/usb-net-dm9601-ether - $(call usbdep,kmod-usb-net @LINUX_2_6) +$(call KernelPackage/usb-net/Depends,@LINUX_2_6) TITLE:=Support for DM9601 ethernet connections KCONFIG:=CONFIG_USB_NET_DM9601 FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/dm9601.$(LINUX_KMOD_SUFFIX) @@ -695,7 +709,7 @@ endef $(eval $(call KernelPackage,usb-net-dm9601-ether)) define KernelPackage/usb-net-cdc-ether - $(call usbdep,kmod-usb-net @LINUX_2_6) +$(call KernelPackage/usb-net/Depends,@LINUX_2_6) TITLE:=Support for cdc ethernet connections KCONFIG:=CONFIG_USB_NET_CDCETHER FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ether.$(LINUX_KMOD_SUFFIX) @@ -710,7 +724,7 @@ $(eval $(call KernelPackage,usb-net-cdc-ether)) define KernelPackage/usb-net-rndis - $(call usbdep,kmod-usb-net @LINUX_2_6) +$(call KernelPackage/usb-net/Depends,@LINUX_2_6) TITLE:=Support for RNDIS connections DEPENDS:=+kmod-usb-net-cdc-ether KCONFIG:=CONFIG_USB_NET_RNDIS_HOST @@ -726,7 +740,7 @@ $(eval $(call KernelPackage,usb-net-rndis)) define KernelPackage/usb-hid - $(call usbdep,@LINUX_2_6 +kmod-input-core +kmod-input-evdev +kmod-hid) +$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-core +kmod-input-evdev +kmod-hid) TITLE:=Support for USB Human Input Devices KCONFIG:=CONFIG_HID_SUPPORT=y CONFIG_USB_HID FILES:=$(LINUX_DIR)/drivers/$(USBHID_DIR)/usbhid.ko @@ -742,7 +756,7 @@ $(eval $(call KernelPackage,usb-hid)) define KernelPackage/usb-yealink - $(call usbdep,@LINUX_2_6 +kmod-input-core +kmod-input-evdev) +$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-core +kmod-input-evdev) TITLE:=USB Yealink VOIP phone KCONFIG:=CONFIG_USB_YEALINK CONFIG_INPUT_YEALINK CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/yealink.ko @@ -757,7 +771,7 @@ $(eval $(call KernelPackage,usb-yealink)) define KernelPackage/usb-cm109 - $(call usbdep,@LINUX_2_6 +kmod-input-core +kmod-input-evdev) +$(call KernelPackage/usb/Depends,@LINUX_2_6 +kmod-input-core +kmod-input-evdev) TITLE:=Support for CM109 device KCONFIG:=CONFIG_USB_CM109 CONFIG_INPUT_CM109 CONFIG_INPUT=m CONFIG_INPUT_MISC=y FILES:=$(LINUX_DIR)/drivers/$(USBINPUT_DIR)/cm109.ko @@ -772,7 +786,7 @@ $(eval $(call KernelPackage,usb-cm109)) define KernelPackage/usb-test - $(call usbdep,@LINUX_2_6 @DEVEL) +$(call KernelPackage/usb/Depends,@LINUX_2_6 @DEVEL) TITLE:=USB Testing Driver KCONFIG:=CONFIG_USB_TEST FILES:=$(LINUX_DIR)/drivers/usb/misc/usbtest.ko @@ -784,8 +798,9 @@ endef $(eval $(call KernelPackage,usb-test)) + define KernelPackage/usb-phidget - $(call usbdep,@LINUX_2_6) +$(call KernelPackage/usb/Depends,@LINUX_2_6) TITLE:=USB Phidget Driver KCONFIG:=CONFIG_USB_PHIDGET CONFIG_USB_PHIDGETKIT CONFIG_USB_PHIDGETMOTORCONTROL CONFIG_USB_PHIDGETSERVO FILES:=$(LINUX_DIR)/drivers/usb/misc/phidget*.ko diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index 17aab27052..1daebc5a62 100644 --- a/package/kernel/modules/video.mk +++ b/package/kernel/modules/video.mk @@ -45,10 +45,15 @@ endef $(eval $(call KernelPackage,video-core)) -define KernelPackage/video-cpia2 +define KernelPackage/video/Depends SUBMENU:=$(VIDEO_MENU) + DEPENDS+=kmod-video-core $(1) +endef + + +define KernelPackage/video-cpia2 +$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) TITLE:=CPIA2 video driver - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core KCONFIG:=CONFIG_VIDEO_CPIA2 FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,cpia2) @@ -62,9 +67,8 @@ $(eval $(call KernelPackage,video-cpia2)) define KernelPackage/video-konica - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) TITLE:=Konica USB webcam support - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-video +kmod-video-core KCONFIG:=CONFIG_USB_KONICAWC FILES:=$(LINUX_DIR)/drivers/media/video/usbvideo/konicawc.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,konicawc) @@ -79,9 +83,8 @@ $(eval $(call KernelPackage,video-konica)) define KernelPackage/video-ov511 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) TITLE:=OV511 USB webcam support - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core KCONFIG:=CONFIG_VIDEO_OV511 FILES:=$(LINUX_DIR)/drivers/media/video/ov511.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,ov511) @@ -96,9 +99,8 @@ $(eval $(call KernelPackage,video-ov511)) define KernelPackage/video-ovcamchip - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-i2c-core) TITLE:=OV6xxx/OV7xxx Camera Chip support - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-i2c-core +kmod-video-core KCONFIG:=CONFIG_VIDEO_OVCAMCHIP FILES:=$(LINUX_DIR)/drivers/media/video/ovcamchip/ovcamchip.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,ovcamchip) @@ -114,9 +116,8 @@ $(eval $(call KernelPackage,video-ovcamchip)) define KernelPackage/video-sn9c102 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) TITLE:=SN9C102 Camera Chip support - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core KCONFIG:=CONFIG_USB_SN9C102 FILES:=$(LINUX_DIR)/drivers/media/video/sn9c102/sn9c102.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,sn9c102) @@ -132,9 +133,8 @@ $(eval $(call KernelPackage,video-sn9c102)) define KernelPackage/video-pwc - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) TITLE:=Philips USB webcam support - DEPENDS:=@LINUX_2_6 @USB_SUPPORT +kmod-usb-core +kmod-video-core KCONFIG:= \ CONFIG_USB_PWC \ CONFIG_USB_PWC_DEBUG=n @@ -150,9 +150,8 @@ endef $(eval $(call KernelPackage,video-pwc)) define KernelPackage/video-uvc - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) TITLE:=USB Video Class (UVC) support - DEPENDS:=@LINUX_2_6 @!LINUX_2_6_25 @USB_SUPPORT +kmod-usb-core +kmod-video-core KCONFIG:= CONFIG_USB_VIDEO_CLASS FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,uvcvideo) @@ -167,16 +166,14 @@ $(eval $(call KernelPackage,video-uvc)) define KernelPackage/video-gspca-core - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video/Depends,@LINUX_2_6 @USB_SUPPORT +kmod-usb-core) MENU:=1 TITLE:=GSPCA webcam core support framework - DEPENDS:=@LINUX_2_6 @!LINUX_2_6_21 @!LINUX_2_6_25 @USB_SUPPORT +kmod-usb-core +kmod-video-core KCONFIG:=CONFIG_USB_GSPCA FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_main.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,70,gspca_main) endef - define KernelPackage/video-gspca-core/description Kernel modules for supporting GSPCA based webcam devices. Note this is just the core of the driver, please select a submodule that supports your webcam. @@ -184,10 +181,16 @@ endef $(eval $(call KernelPackage,video-gspca-core)) -define KernelPackage/video-gspca-conex + +define KernelPackage/video-gspca/Depends SUBMENU:=$(VIDEO_MENU) + DEPENDS+=kmod-video-gspca-core $(1) +endef + + +define KernelPackage/video-gspca-conex +$(call KernelPackage/video-gspca/Depends,) TITLE:=conex webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_CONEX FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_conex.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_conex) @@ -201,9 +204,8 @@ $(eval $(call KernelPackage,video-gspca-conex)) define KernelPackage/video-gspca-etoms - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=etoms webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_ETOMS FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_etoms.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_etoms) @@ -217,9 +219,8 @@ $(eval $(call KernelPackage,video-gspca-etoms)) define KernelPackage/video-gspca-finepix - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=finepix webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_FINEPIX FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_finepix.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_finepix) @@ -233,9 +234,8 @@ $(eval $(call KernelPackage,video-gspca-finepix)) define KernelPackage/video-gspca-mars - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=mars webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_MARS FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_mars.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_mars) @@ -249,9 +249,8 @@ $(eval $(call KernelPackage,video-gspca-mars)) define KernelPackage/video-gspca-mr97310a - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=mr97310a webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_MR97310A FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_mr97310a.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_mr97310a) @@ -265,9 +264,8 @@ $(eval $(call KernelPackage,video-gspca-mr97310a)) define KernelPackage/video-gspca-ov519 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=ov519 webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_OV519 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_ov519.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_ov519) @@ -281,9 +279,8 @@ $(eval $(call KernelPackage,video-gspca-ov519)) define KernelPackage/video-gspca-ov534 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=ov534 webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_OV534 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_ov534.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_ov534) @@ -297,9 +294,8 @@ $(eval $(call KernelPackage,video-gspca-ov534)) define KernelPackage/video-gspca-pac207 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=pac207 webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_PAC207 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_pac207.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_pac207) @@ -313,9 +309,8 @@ $(eval $(call KernelPackage,video-gspca-pac207)) define KernelPackage/video-gspca-pac7311 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=pac7311 webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_PAC7311 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_pac7311.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_pac7311) @@ -329,9 +324,8 @@ $(eval $(call KernelPackage,video-gspca-pac7311)) define KernelPackage/video-gspca-sonixb - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=sonixb webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_SONIXB FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sonixb.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_sonixb) @@ -345,9 +339,8 @@ $(eval $(call KernelPackage,video-gspca-sonixb)) define KernelPackage/video-gspca-sonixj - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=sonixj webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_SONIXJ FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sonixj.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_sonixj) @@ -361,9 +354,8 @@ $(eval $(call KernelPackage,video-gspca-sonixj)) define KernelPackage/video-gspca-spca500 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=spca500 webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_SPCA500 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca500.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_spca500) @@ -377,9 +369,8 @@ $(eval $(call KernelPackage,video-gspca-spca500)) define KernelPackage/video-gspca-spca501 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=spca501 webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_SPCA501 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca501.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_spca501) @@ -393,9 +384,8 @@ $(eval $(call KernelPackage,video-gspca-spca501)) define KernelPackage/video-gspca-spca505 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=spca505 webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_SPCA505 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca505.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_spca505) @@ -409,9 +399,8 @@ $(eval $(call KernelPackage,video-gspca-spca505)) define KernelPackage/video-gspca-spca506 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=spca506 webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_SPCA506 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca506.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_spca506) @@ -425,9 +414,8 @@ $(eval $(call KernelPackage,video-gspca-spca506)) define KernelPackage/video-gspca-spca508 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=spca508 webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_SPCA508 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca508.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_spca508) @@ -441,9 +429,8 @@ $(eval $(call KernelPackage,video-gspca-spca508)) define KernelPackage/video-gspca-spca561 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=spca561 webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_SPCA561 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca561.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_spca561) @@ -457,9 +444,8 @@ $(eval $(call KernelPackage,video-gspca-spca561)) define KernelPackage/video-gspca-sq905 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=sq905 webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_SQ905 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_sq905) @@ -473,9 +459,8 @@ $(eval $(call KernelPackage,video-gspca-sq905)) define KernelPackage/video-gspca-sq905c - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=sq905c webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_SQ905C FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905c.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_sq905c) @@ -489,9 +474,8 @@ $(eval $(call KernelPackage,video-gspca-sq905c)) define KernelPackage/video-gspca-stk014 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=stk014 webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_STK014 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_stk014.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_stk014) @@ -505,9 +489,8 @@ $(eval $(call KernelPackage,video-gspca-stk014)) define KernelPackage/video-gspca-sunplus - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=sunplus webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_SUNPLUS FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sunplus.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_sunplus) @@ -521,9 +504,8 @@ $(eval $(call KernelPackage,video-gspca-sunplus)) define KernelPackage/video-gspca-t613 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=t613 webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_T613 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_t613.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_t613) @@ -537,9 +519,8 @@ $(eval $(call KernelPackage,video-gspca-t613)) define KernelPackage/video-gspca-tv8532 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=tv8532 webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_TV8532 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_tv8532.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_tv8532) @@ -553,9 +534,8 @@ $(eval $(call KernelPackage,video-gspca-tv8532)) define KernelPackage/video-gspca-vc032x - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=vc032x webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_VC032X FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_vc032x.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_vc032x) @@ -569,9 +549,8 @@ $(eval $(call KernelPackage,video-gspca-vc032x)) define KernelPackage/video-gspca-zc3xx - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=zc3xx webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_GSPCA_ZC3XX FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_zc3xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_zc3xx) @@ -585,9 +564,8 @@ $(eval $(call KernelPackage,video-gspca-zc3xx)) define KernelPackage/video-gspca-m5602 - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=m5602 webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_M5602 FILES:=$(LINUX_DIR)/drivers/media/video/gspca/m5602/gspca_m5602.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_m5602) @@ -601,9 +579,8 @@ $(eval $(call KernelPackage,video-gspca-m5602)) define KernelPackage/video-gspca-stv06xx - SUBMENU:=$(VIDEO_MENU) +$(call KernelPackage/video-gspca/Depends,) TITLE:=stv06xx webcam support - DEPENDS:=kmod-video-gspca-core KCONFIG:=CONFIG_USB_STV06XX FILES:=$(LINUX_DIR)/drivers/media/video/gspca/stv06xx/gspca_stv06xx.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,75,gspca_stv06xx) diff --git a/package/kernel/modules/w1.mk b/package/kernel/modules/w1.mk index aa1de25516..68d502799a 100644 --- a/package/kernel/modules/w1.mk +++ b/package/kernel/modules/w1.mk @@ -24,9 +24,10 @@ endef $(eval $(call KernelPackage,w1)) -define w1dep + +define KernelPackage/w1/Depends SUBMENU:=$(W1_MENU) - DEPENDS:=kmod-w1 $(1) + DEPENDS+=kmod-w1 $(1) endef @@ -34,7 +35,7 @@ endef # 1-wire masters # define KernelPackage/w1-master-gpio - $(call w1dep,@GPIO_SUPPORT) +$(call KernelPackage/w1/Depends,@GPIO_SUPPORT) TITLE:=GPIO 1-wire bus master driver KCONFIG:=CONFIG_W1_MASTER_GPIO FILES:=$(W1_MASTERS_DIR)/w1-gpio.$(LINUX_KMOD_SUFFIX) @@ -52,7 +53,7 @@ $(eval $(call KernelPackage,w1-master-gpio)) # 1-wire slaves # define KernelPackage/w1-slave-therm - $(call w1dep,) +$(call KernelPackage/w1/Depends,) TITLE:=Thermal family implementation KCONFIG:=CONFIG_W1_SLAVE_THERM FILES:=$(W1_SLAVES_DIR)/w1_therm.$(LINUX_KMOD_SUFFIX) @@ -67,7 +68,7 @@ $(eval $(call KernelPackage,w1-slave-therm)) define KernelPackage/w1-slave-smem - $(call w1dep,) +$(call KernelPackage/w1/Depends,) TITLE:=Simple 64bit memory family implementation KCONFIG:=CONFIG_W1_SLAVE_SMEM FILES:=$(W1_SLAVES_DIR)/w1_smem.$(LINUX_KMOD_SUFFIX) @@ -81,7 +82,7 @@ endef $(eval $(call KernelPackage,w1-slave-smem)) define KernelPackage/w1-slave-ds2433 - $(call w1dep,) +$(call KernelPackage/w1/Depends,) TITLE:=Simple 64bit memory family implementation KCONFIG:= \ CONFIG_W1_SLAVE_DS2433 \ @@ -98,7 +99,7 @@ $(eval $(call KernelPackage,w1-slave-ds2433)) define KernelPackage/w1-slave-ds2760 - $(call w1dep,) +$(call KernelPackage/w1/Depends,) TITLE:=Dallas 2760 battery monitor chip (HP iPAQ & others) KCONFIG:= \ CONFIG_W1_SLAVE_DS2760 \ |