Add the 93cx6 patch to generic-2.6, correctly fix dependencies on the rt2x00 drivers (thanks to Daniel Gimpelevich)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8200 3c298f89-4303-0410-b956-a3cf2f4a3e73

2 files changed, 61 insertions, 3 deletions

diff --git a/package/rt2x00/Makefile b/package/rt2x00/Makefile
index dbfff83f4..efe290d9b 100644
--- a/package/rt2x00/Makefile
+++ b/package/rt2x00/Makefile
@@ -16,7 +16,7 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/rt2x00/Default
   SUBMENU:=Wireless Drivers
-  DEPENDS:=@LINUX_2_6 +kmod-mac80211 @LINUX_2_6_X86||@LINUX_2_6_RDC
+  DEPENDS:=+kmod-mac80211
   TITLE:=Ralink GPL Drivers
   DESCRIPTION:=Ralink GPL Drivers for rt2x00 cards
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(LINUX_RELEASE)
@@ -32,6 +32,7 @@ endef
 
 define KernelPackage/rt2x00-pci
   $(call Package/rt2x00/Default)
+  DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-lib
   TITLE+= (PCI)
   DESCRIPTION+= (PCI)
   FILES:=$(PKG_BUILD_DIR)/rt2x00pci.$(LINUX_KMOD_SUFFIX)
@@ -40,15 +41,62 @@ endef
 
 define KernelPackage/rt2x00-usb
   $(call Package/rt2x00/Default)
+  DEPENDS+= @USB_SUPPORT +kmod-rt2x00-lib
   TITLE+= (USB)
   DESCRIPTION+= (USB)
   FILES:=$(PKG_BUILD_DIR)/rt2x00usb.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,26,rt2x00usb)
 endef
 
+define KernelPackage/rt2400-pci
+  $(call Package/rt2x00/Default)
+  DEPENDS+= +kmod-rt2x00-pci
+  TITLE+= (RT2400 PCI)
+  DESCRIPTION+= (RT2400 PCI)
+  FILES:=$(PKG_BUILD_DIR)/rt2400pci.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,27,rt2400pci)
+endef
+
+define KernelPackage/rt2500-pci
+  $(call Package/rt2x00/Default)
+  DEPENDS+= +kmod-rt2x00-pci
+  TITLE+= (RT2500 PCI)
+  DESCRIPTION+= (RT2500 PCI)
+  FILES:=$(PKG_BUILD_DIR)/rt2500pci.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,27,rt2500pci)
+endef
+
+define KernelPackage/rt2500-usb
+  $(call Package/rt2x00/Default)
+  DEPENDS+= +kmod-rt2x00-usb
+  TITLE+= (RT2500 USB)
+  DESCRIPTION+= (RT2500 USB)
+  FILES:=$(PKG_BUILD_DIR)/rt2500usb.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,27,rt2500usb)
+endef
+
+define KernelPackage/rt61-pci
+  $(call Package/rt2x00/Default)
+  DEPENDS+= +kmod-rt2x00-pci
+  TITLE+= (RT2x61 PCI)
+  DESCRIPTION+= (RT2x61 PCI)
+  FILES:=$(PKG_BUILD_DIR)/rt61pci.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,27,rt61pci)
+endef
+
+define KernelPackage/rt73-usb
+  $(call Package/rt2x00/Default)
+  DEPENDS+= +kmod-rt2x00-usb
+  TITLE+= (RT73 USB)
+  DESCRIPTION+= (RT73 USB)
+  FILES:=$(PKG_BUILD_DIR)/rt73usb.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,27,rt73usb)
+endef
+
 define Build/Prepare
 	$(call Build/Prepare/Default)
 	$(CP) -r src/* $(PKG_BUILD_DIR)/
+	sed 's/\$$$$(CONFIG_RT.*)/m\t\t/g' src/Makefile > $(PKG_BUILD_DIR)/Makefile
 endef
 
 define Build/Compile
@@ -65,3 +113,8 @@ endef
 $(eval $(call KernelPackage,rt2x00-lib))
 $(eval $(call KernelPackage,rt2x00-pci))
 $(eval $(call KernelPackage,rt2x00-usb))
+$(eval $(call KernelPackage,rt2400-pci))
+$(eval $(call KernelPackage,rt2500-pci))
+$(eval $(call KernelPackage,rt2500-usb))
+$(eval $(call KernelPackage,rt61-pci))
+$(eval $(call KernelPackage,rt73-usb))
diff --git a/package/rt61/Makefile b/package/rt61/Makefile
index b40d496c8..6e7c600e1 100644
--- a/package/rt61/Makefile
+++ b/package/rt61/Makefile
@@ -22,9 +22,9 @@ include $(INCLUDE_DIR)/package.mk
 define KernelPackage/rt61
   SUBMENU:=Wireless Drivers
   TITLE:=Driver for ralink MiMo pci chipsets 
-  DEPENDS:=@LINUX_2_6_RDC +wireless-tools
+  DEPENDS:=@PCI_SUPPORT +wireless-tools
   DESCRIPTION:=\
-        This package contains a driver for ralink rt61xx pci chipsets.
+        This package contains a driver for ralink rt2x61 pci chipsets.
   URL:=http://rt2x00.serialmonkey.com/
   VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
   FILES:= \
@@ -32,6 +32,11 @@ define KernelPackage/rt61
   AUTOLOAD:=$(call AutoLoad,50,rt61)
 endef
 
+define KernelPackage/rt61/install
+	mkdir $(1)/lib/firmware
+	$(CP) -L $(PKG_BUILD_DIR)/Module/rt2*.bin $(1)/lib/firmware
+endef
+
 LINUX_PATCHLEVEL:=$(shell echo "$(LINUX_VERSION)" | cut -d. -f2)
 
 define Build/Compile