projects
/
lede.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6226b53
)
add missing dependencies on PCI/PCMCIA/USB support
author
Nicolas Thill
<nico@openwrt.org>
Sun, 16 Sep 2007 16:21:56 +0000
(16:21 +0000)
committer
Nicolas Thill
<nico@openwrt.org>
Sun, 16 Sep 2007 16:21:56 +0000
(16:21 +0000)
SVN-Revision: 8801
package/hostap-driver/Makefile
patch
|
blob
|
history
package/kernel/modules/block.mk
patch
|
blob
|
history
package/kernel/modules/wireless.mk
patch
|
blob
|
history
package/rt2x00/Makefile
patch
|
blob
|
history
package/zd1211-driver/Makefile
patch
|
blob
|
history
diff --git
a/package/hostap-driver/Makefile
b/package/hostap-driver/Makefile
index 9ade13ec6578b2c756b8839daa1f1710427af997..b784131a1d3aaf9cb9344d5d04087543b8688c32 100644
(file)
--- a/
package/hostap-driver/Makefile
+++ b/
package/hostap-driver/Makefile
@@
-70,7
+70,7
@@
endef
define KernelPackage/hostap-pci
$(call KernelPackage/hostap/Default)
define KernelPackage/hostap-pci
$(call KernelPackage/hostap/Default)
- DEPENDS:=kmod-hostap
+ DEPENDS:=
@PCI_SUPPORT
kmod-hostap
TITLE:=Host AP driver for PCI adaptors
KCONFIG:=CONFIG_HOSTAP_PCI
AUTOLOAD:=$(call AutoLoad,60,hostap_pci)
TITLE:=Host AP driver for PCI adaptors
KCONFIG:=CONFIG_HOSTAP_PCI
AUTOLOAD:=$(call AutoLoad,60,hostap_pci)
@@
-91,7
+91,7
@@
endef
define KernelPackage/hostap-plx
$(call KernelPackage/hostap/Default)
define KernelPackage/hostap-plx
$(call KernelPackage/hostap/Default)
- DEPENDS:=kmod-hostap
+ DEPENDS:=
@PCI_SUPPORT
kmod-hostap
KCONFIG:=CONFIG_HOSTAP_PLX
TITLE:=Host AP driver for PLX9052 based PCI adaptors
AUTOLOAD:=$(call AutoLoad,60,hostap_plx)
KCONFIG:=CONFIG_HOSTAP_PLX
TITLE:=Host AP driver for PLX9052 based PCI adaptors
AUTOLOAD:=$(call AutoLoad,60,hostap_plx)
diff --git
a/package/kernel/modules/block.mk
b/package/kernel/modules/block.mk
index 1fea5c4c5cdcf16a18e13d4ed06274a5e4e898cc..9b81fa887fd3e51db47492e0dd8cb1a69cb80d5d 100644
(file)
--- a/
package/kernel/modules/block.mk
+++ b/
package/kernel/modules/block.mk
@@
-52,6
+52,7
@@
$(eval $(call KernelPackage,ide-pdc202xx))
define KernelPackage/ide-aec62xx
SUBMENU:=$(BLMENU)
TITLE:=AEC62xx IDE driver
define KernelPackage/ide-aec62xx
SUBMENU:=$(BLMENU)
TITLE:=AEC62xx IDE driver
+ DEPENDS:=@PCI_SUPPORT
KCONFIG:=CONFIG_BLK_DEV_AEC62XX
FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,aec62xx)
KCONFIG:=CONFIG_BLK_DEV_AEC62XX
FILES:=$(LINUX_DIR)/drivers/ide/pci/aec62xx.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,aec62xx)
diff --git
a/package/kernel/modules/wireless.mk
b/package/kernel/modules/wireless.mk
index e63039a28b8933a4b134a7f84af2643a056f4207..c44a628c5a6f48bc6f4f1506179ad4ee89f26085 100644
(file)
--- a/
package/kernel/modules/wireless.mk
+++ b/
package/kernel/modules/wireless.mk
@@
-64,7
+64,7
@@
$(eval $(call KernelPackage,ieee80211-softmac))
define KernelPackage/net-bcm43xx
SUBMENU:=$(WIMENU)
TITLE:=Broadcom BCM43xx driver
define KernelPackage/net-bcm43xx
SUBMENU:=$(WIMENU)
TITLE:=Broadcom BCM43xx driver
- DEPENDS:=kmod-ieee80211-softmac
+ DEPENDS:=
@PCI_SUPPORT +
kmod-ieee80211-softmac
KCONFIG:=CONFIG_BCM43XX
FILES:=$(LINUX_DIR)/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,bcm43xx)
KCONFIG:=CONFIG_BCM43XX
FILES:=$(LINUX_DIR)/drivers/net/wireless/bcm43xx/bcm43xx.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,bcm43xx)
@@
-82,7
+82,7
@@
$(eval $(call KernelPackage,net-bcm43xx))
define KernelPackage/net-ipw2100
SUBMENU:=$(WIMENU)
TITLE:=Intel IPW2100 driver
define KernelPackage/net-ipw2100
SUBMENU:=$(WIMENU)
TITLE:=Intel IPW2100 driver
- DEPENDS:=kmod-ieee80211
+ DEPENDS:=
@PCI_SUPPORT +
kmod-ieee80211
KCONFIG:=CONFIG_IPW2100
FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,ipw2100)
KCONFIG:=CONFIG_IPW2100
FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2100.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,ipw2100)
@@
-100,7
+100,7
@@
$(eval $(call KernelPackage,net-ipw2100))
define KernelPackage/net-ipw2200
SUBMENU:=$(WIMENU)
TITLE:=Intel IPW2200 driver
define KernelPackage/net-ipw2200
SUBMENU:=$(WIMENU)
TITLE:=Intel IPW2200 driver
- DEPENDS:=kmod-ieee80211
+ DEPENDS:=
@PCI_SUPPORT +
kmod-ieee80211
KCONFIG:=CONFIG_IPW2200
FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,ipw2200)
KCONFIG:=CONFIG_IPW2200
FILES:=$(LINUX_DIR)/drivers/net/wireless/ipw2200.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,ipw2200)
@@
-118,6
+118,7
@@
$(eval $(call KernelPackage,net-ipw2200))
define KernelPackage/net-airo
SUBMENU:=$(WIMENU)
TITLE:=Cisco Aironet driver
define KernelPackage/net-airo
SUBMENU:=$(WIMENU)
TITLE:=Cisco Aironet driver
+ DEPENDS:=@PCI_SUPPORT
KCONFIG:=CONFIG_AIRO
FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,airo)
KCONFIG:=CONFIG_AIRO
FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,50,airo)
@@
-133,7
+134,7
@@
$(eval $(call KernelPackage,net-airo))
define KernelPackage/net-hermes
SUBMENU:=$(WIMENU)
TITLE:=Hermes 802.11b chipset support
define KernelPackage/net-hermes
SUBMENU:=$(WIMENU)
TITLE:=Hermes 802.11b chipset support
- DEPENDS:=@LINUX_2_6
+ DEPENDS:=@LINUX_2_6
@PCI_SUPPORT||PCMCIA_SUPPORT
KCONFIG:=CONFIG_HERMES
FILES:= \
$(LINUX_DIR)/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \
KCONFIG:=CONFIG_HERMES
FILES:= \
$(LINUX_DIR)/drivers/net/wireless/hermes.$(LINUX_KMOD_SUFFIX) \
@@
-151,7
+152,7
@@
$(eval $(call KernelPackage,net-hermes))
define KernelPackage/net-hermes-pci
SUBMENU:=$(WIMENU)
TITLE:=Intersil Prism 2.5 PCI support
define KernelPackage/net-hermes-pci
SUBMENU:=$(WIMENU)
TITLE:=Intersil Prism 2.5 PCI support
- DEPENDS:=kmod-net-hermes
+ DEPENDS:=
@PCI_SUPPORT
kmod-net-hermes
KCONFIG:=CONFIG_PCI_HERMES
FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
KCONFIG:=CONFIG_PCI_HERMES
FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_pci.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,55,orinoco_pci)
@@
-167,7
+168,7
@@
$(eval $(call KernelPackage,net-hermes-pci))
define KernelPackage/net-hermes-plx
SUBMENU:=$(WIMENU)
TITLE:=PLX9052 based PCI adaptor
define KernelPackage/net-hermes-plx
SUBMENU:=$(WIMENU)
TITLE:=PLX9052 based PCI adaptor
- DEPENDS:=kmod-net-hermes
+ DEPENDS:=
@PCI_SUPPORT
kmod-net-hermes
KCONFIG:=CONFIG_PLX_HERMES
FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
KCONFIG:=CONFIG_PLX_HERMES
FILES:=$(LINUX_DIR)/drivers/net/wireless/orinoco_plx.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,55,orinoco_plx)
@@
-183,6
+184,7
@@
$(eval $(call KernelPackage,net-hermes-plx))
define KernelPackage/net-prism54
SUBMENU:=$(WIMENU)
TITLE:=Intersil Prism54 support
define KernelPackage/net-prism54
SUBMENU:=$(WIMENU)
TITLE:=Intersil Prism54 support
+ DEPENDS:=@PCI_SUPPORT
KCONFIG:=CONFIG_PRISM54
FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,60,prism54)
KCONFIG:=CONFIG_PRISM54
FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,60,prism54)
@@
-198,7
+200,7
@@
$(eval $(call KernelPackage,net-prism54))
define KernelPackage/net-zd1211rw
SUBMENU:=$(WIMENU)
TITLE:=Zydas ZD1211 support
define KernelPackage/net-zd1211rw
SUBMENU:=$(WIMENU)
TITLE:=Zydas ZD1211 support
- DEPENDS:=
+kmod-ieee80211 +zd1211-firmware @LINUX_2_6
+ DEPENDS:=
@LINUX_2_6 @USB_SUPPORT +kmod-ieee80211 +zd1211-firmware
KCONFIG:=CONFIG_ZD1211RW
FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
KCONFIG:=CONFIG_ZD1211RW
FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1211rw/zd1211rw.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,60,zd1211rw)
diff --git
a/package/rt2x00/Makefile
b/package/rt2x00/Makefile
index bb5b453dfc41efd6d0bbe7e21e5f53f638b16307..a6c7e5c86b41b2462a72970ac799e2b874932371 100644
(file)
--- a/
package/rt2x00/Makefile
+++ b/
package/rt2x00/Makefile
@@
-34,7
+34,7
@@
endef
define KernelPackage/rt2x00-lib
$(call KernelPackage/rt2x00/Default)
define KernelPackage/rt2x00-lib
$(call KernelPackage/rt2x00/Default)
- DEPENDS+= +kmod-mac80211 +kmod-crypto
+ DEPENDS+=
@PCI_SUPPORT||USB_SUPPORT
+kmod-mac80211 +kmod-crypto
TITLE+= (LIB)
FILES:=$(PKG_BUILD_DIR)/rt2x00lib.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,25,blkcipher ecb arc4 rt2x00lib)
TITLE+= (LIB)
FILES:=$(PKG_BUILD_DIR)/rt2x00lib.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,25,blkcipher ecb arc4 rt2x00lib)
@@
-58,7
+58,7
@@
endef
define KernelPackage/rt2400-pci
$(call KernelPackage/rt2x00/Default)
define KernelPackage/rt2400-pci
$(call KernelPackage/rt2x00/Default)
- DEPENDS+= +kmod-rt2x00-pci
+ DEPENDS+=
@PCI_SUPPORT
+kmod-rt2x00-pci
TITLE+= (RT2400 PCI)
FILES:=$(PKG_BUILD_DIR)/rt2400pci.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,27,rt2400pci)
TITLE+= (RT2400 PCI)
FILES:=$(PKG_BUILD_DIR)/rt2400pci.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,27,rt2400pci)
@@
-66,7
+66,7
@@
endef
define KernelPackage/rt2500-pci
$(call KernelPackage/rt2x00/Default)
define KernelPackage/rt2500-pci
$(call KernelPackage/rt2x00/Default)
- DEPENDS+= +kmod-rt2x00-pci
+ DEPENDS+=
@PCI_SUPPORT
+kmod-rt2x00-pci
TITLE+= (RT2500 PCI)
FILES:=$(PKG_BUILD_DIR)/rt2500pci.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,27,rt2500pci)
TITLE+= (RT2500 PCI)
FILES:=$(PKG_BUILD_DIR)/rt2500pci.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,27,rt2500pci)
@@
-74,7
+74,7
@@
endef
define KernelPackage/rt2500-usb
$(call KernelPackage/rt2x00/Default)
define KernelPackage/rt2500-usb
$(call KernelPackage/rt2x00/Default)
- DEPENDS+= +kmod-rt2x00-usb +kmod-crc-itu-t
+ DEPENDS+=
@USB_SUPPORT
+kmod-rt2x00-usb +kmod-crc-itu-t
TITLE+= (RT2500 USB)
FILES:=$(PKG_BUILD_DIR)/rt2500usb.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,27,rt2500usb)
TITLE+= (RT2500 USB)
FILES:=$(PKG_BUILD_DIR)/rt2500usb.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,27,rt2500usb)
@@
-82,7
+82,7
@@
endef
define KernelPackage/rt61-pci
$(call KernelPackage/rt2x00/Default)
define KernelPackage/rt61-pci
$(call KernelPackage/rt2x00/Default)
- DEPENDS+= +kmod-rt2x00-pci +kmod-crc-itu-t
+ DEPENDS+=
@PCI_SUPPORT
+kmod-rt2x00-pci +kmod-crc-itu-t
TITLE+= (RT2x61 PCI)
FILES:=$(PKG_BUILD_DIR)/rt61pci.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,27,rt61pci)
TITLE+= (RT2x61 PCI)
FILES:=$(PKG_BUILD_DIR)/rt61pci.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,27,rt61pci)
@@
-90,7
+90,7
@@
endef
define KernelPackage/rt73-usb
$(call KernelPackage/rt2x00/Default)
define KernelPackage/rt73-usb
$(call KernelPackage/rt2x00/Default)
- DEPENDS+= +kmod-rt2x00-usb
+ DEPENDS+=
@USB_SUPPORT
+kmod-rt2x00-usb
TITLE+= (RT73 USB)
FILES:=$(PKG_BUILD_DIR)/rt73usb.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,27,rt73usb)
TITLE+= (RT73 USB)
FILES:=$(PKG_BUILD_DIR)/rt73usb.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,27,rt73usb)
diff --git
a/package/zd1211-driver/Makefile
b/package/zd1211-driver/Makefile
index c078dc5e5fcc1fb3a52783238d7c18c5b6fdcdca..1abfc036081eb44f2e50c933d0311e6a55914bcc 100644
(file)
--- a/
package/zd1211-driver/Makefile
+++ b/
package/zd1211-driver/Makefile
@@
-22,7
+22,7
@@
include $(INCLUDE_DIR)/package.mk
#FIXME: add proper dependency handling on kmod-usb-core packages
define KernelPackage/zd1211
SUBMENU:=Wireless Drivers
#FIXME: add proper dependency handling on kmod-usb-core packages
define KernelPackage/zd1211
SUBMENU:=Wireless Drivers
- DEPENDS:=@LINUX_2_6 @USB_SUPPORT
+ DEPENDS:=@LINUX_2_6 @USB_SUPPORT
+kmod-usb-core
TITLE:=Driver for Zydas 1211 based USB devices
FILES:=$(PKG_BUILD_DIR)/zd1211.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,60,zd1211)
TITLE:=Driver for Zydas 1211 based USB devices
FILES:=$(PKG_BUILD_DIR)/zd1211.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,60,zd1211)