X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c4b73fa154ce47702ee9b3bbe621d8f079eb7fa5..ebe4d354283f45ba15f83d080e8a93a46ee29a9e:/package/rt2x00/Makefile?ds=sidebyside

diff --git a/package/rt2x00/Makefile b/package/rt2x00/Makefile
index e4080b3a8..1e95e27a9 100644
--- a/package/rt2x00/Makefile
+++ b/package/rt2x00/Makefile
@@ -14,27 +14,25 @@ PKG_VERSION:=cvs-20070712
 
 PKG_FW6X_NAME:=RT61_Firmware_V1.2.zip
 PKG_FW6X_URL:=http://www.ralinktech.com.tw/data/
-PKG_FW6X_MD5SUM:=fe64f389f0863ef349a8c97e0fbc8838
+PKG_FW6X_MD5SUM:=d4c690c93b470bc9a681297c2adc6281
 
 PKG_FW7X_NAME:=RT71W_Firmware_V1.8.zip
 PKG_FW7X_URL:=http://www.ralinktech.com.tw/data/
-PKG_FW7X_MD5SUM:=db4ef70b61e483f34db496738507b275
+PKG_FW7X_MD5SUM:=1e7a5dc574e0268574fcda3fd5cf52f7
 
 include $(INCLUDE_DIR)/package.mk
-ifeq ($(DUMP),)
-  include $(LINUX_DIR)/.config
-endif
 
+# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets
 define KernelPackage/rt2x00/Default
   SUBMENU:=Wireless Drivers
   TITLE:=Ralink Drivers for RT2x00 cards
-  DEPENDS:=@LINUX_2_6
+  DEPENDS:=@LINUX_2_6 @!TARGET_atheros @!TARGET_uml
   KCONFIG:=CONFIG_MAC80211
 endef
 
 define KernelPackage/rt2x00-lib
 $(call KernelPackage/rt2x00/Default)
-  DEPENDS+= +kmod-mac80211 +kmod-crypto
+  DEPENDS+= @PCI_SUPPORT||USB_SUPPORT +kmod-mac80211
   TITLE+= (LIB)
   FILES:=$(PKG_BUILD_DIR)/rt2x00lib.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,25,blkcipher ecb arc4 rt2x00lib)
@@ -58,7 +56,7 @@ endef
 
 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)
@@ -66,7 +64,7 @@ endef
 
 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)
@@ -74,7 +72,7 @@ endef
 
 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)
@@ -82,7 +80,7 @@ endef
 
 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)
@@ -90,7 +88,7 @@ endef
 
 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)