X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/3ba84cb70821c6a2dd091bb2140b01abe31574a7..f90cb20b9a2c4e4c5d8f3af569264726fb6ddcf8:/package/rt2x00/Makefile

diff --git a/package/rt2x00/Makefile b/package/rt2x00/Makefile
index efe290d9b..4d63963bc 100644
--- a/package/rt2x00/Makefile
+++ b/package/rt2x00/Makefile
@@ -9,105 +9,164 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-PKG_NAME:=kmod-rt2x00
-PKG_VERSION:=git-200706018
+PKG_NAME:=rt2x00
+PKG_VERSION:=cvs-20070712
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/rt2x00/Default
+
+RT61FW:=RT61_Firmware_V1.2.zip
+RT71FW:=RT71W_Firmware_V1.8.zip
+
+define Download/rt61
+  FILE:=$(RT61FW)
+  URL:=http://www.ralinktech.com.tw/data/
+  MD5SUM:=d4c690c93b470bc9a681297c2adc6281
+endef
+$(eval $(call Download,rt61))
+
+define Download/rt71w
+  FILE:=$(RT71FW)
+  URL:=http://www.ralinktech.com.tw/data/
+  MD5SUM:=1e7a5dc574e0268574fcda3fd5cf52f7
+endef
+$(eval $(call Download,rt71w))
+
+# XXX: remove @!TARGET_* later when we have PCI & USB support properly detected on all targets
+define KernelPackage/rt2x00/Default
   SUBMENU:=Wireless Drivers
-  DEPENDS:=+kmod-mac80211
-  TITLE:=Ralink GPL Drivers
-  DESCRIPTION:=Ralink GPL Drivers for rt2x00 cards
-  VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(LINUX_RELEASE)
+  TITLE:=Ralink Drivers for RT2x00 cards
+  DEPENDS:=@LINUX_2_6 @!TARGET_atheros @!TARGET_uml
 endef
 
 define KernelPackage/rt2x00-lib
-  $(call Package/rt2x00/Default)
+$(call KernelPackage/rt2x00/Default)
+  DEPENDS+= @PCI_SUPPORT||USB_SUPPORT +kmod-mac80211
   TITLE+= (LIB)
-  DESCRIPTION+= (LIB)
   FILES:=$(PKG_BUILD_DIR)/rt2x00lib.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,rt2x00lib)
+  AUTOLOAD:=$(call AutoLoad,25,blkcipher ecb arc4 rt2x00lib)
 endef
 
 define KernelPackage/rt2x00-pci
-  $(call Package/rt2x00/Default)
-  DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-lib
+$(call KernelPackage/rt2x00/Default)
+  DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-lib +kmod-eeprom-93cx6
   TITLE+= (PCI)
-  DESCRIPTION+= (PCI)
   FILES:=$(PKG_BUILD_DIR)/rt2x00pci.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,26,rt2x00pci)
 endef
 
 define KernelPackage/rt2x00-usb
-  $(call Package/rt2x00/Default)
-  DEPENDS+= @USB_SUPPORT +kmod-rt2x00-lib
+$(call KernelPackage/rt2x00/Default)
+  DEPENDS+= @USB_SUPPORT +kmod-rt2x00-lib +kmod-usb-core
   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
+$(call KernelPackage/rt2x00/Default)
+  DEPENDS+= @PCI_SUPPORT +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
+$(call KernelPackage/rt2x00/Default)
+  DEPENDS+= @PCI_SUPPORT +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
+$(call KernelPackage/rt2x00/Default)
+  DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb +kmod-crc-itu-t
   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
+$(call KernelPackage/rt2x00/Default)
+  DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-pci +kmod-crc-itu-t
   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
+  $(call KernelPackage/rt2x00/Default)
+  DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb
   TITLE+= (RT73 USB)
-  DESCRIPTION+= (RT73 USB)
   FILES:=$(PKG_BUILD_DIR)/rt73usb.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,27,rt73usb)
 endef
 
+$(STAMP_PREPARED): $(DL_DIR)/$(PKG_FW6X_NAME) $(DL_DIR)/$(PKG_FW7X_NAME)
+
+PKG_EXTRA_KCONFIG:= \
+	CONFIG_MAC80211=y \
+	CONFIG_RT2X00=y \
+	CONFIG_RT2X00_DEBUG=y \
+
+ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-pci),)
+  PKG_EXTRA_KCONFIG+= CONFIG_RT2X00PCI=y
+endif
+ifneq ($(CONFIG_PACKAGE_kmod-rt2x00-usb),)
+  PKG_EXTRA_KCONFIG+= CONFIG_RT2X00USB=y
+endif
+ifneq ($(CONFIG_PACKAGE_kmod-rt2400-pci),)
+  PKG_EXTRA_KCONFIG+= CONFIG_RT2400PCI=y
+endif
+ifneq ($(CONFIG_PACKAGE_kmod-rt2500-pci),)
+  PKG_EXTRA_KCONFIG+= CONFIG_RT2500PCI=y
+endif
+ifneq ($(CONFIG_PACKAGE_kmod-rt2500-usb),)
+  PKG_EXTRA_KCONFIG+= CONFIG_RT2500USB=y
+endif
+ifneq ($(CONFIG_PACKAGE_kmod-rt61-pci),)
+  PKG_EXTRA_KCONFIG+= CONFIG_RT61PCI=y
+endif
+ifneq ($(CONFIG_PACKAGE_kmod-rt73-usb),)
+  PKG_EXTRA_KCONFIG+= CONFIG_RT73USB=y
+endif
+
+PKG_EXTRA_CFLAGS:= \
+	-I$(STAGING_DIR)/usr/include/mac80211 \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \
+
 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
+	$(CP) src/* $(PKG_BUILD_DIR)/
+	unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT61FW)
+	unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(RT71FW)
+endef
+
+define Build/Configure
+	touch $(PKG_BUILD_DIR)/rt2x00_config.h
 endef
 
 define Build/Compile
 	$(MAKE) -C "$(LINUX_DIR)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
 		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
 		SUBDIRS="$(PKG_BUILD_DIR)" \
-		KERNELVERSION="$(KERNEL)" \
-		KERNEL_SOURCE="$(LINUX_DIR)" \
-		EXTRA_CFLAGS="$(BUILDFLAGS) -include $(PKG_BUILD_DIR)/rt2x00_compat.h" \
-		KDIR="$(LINUX_DIR)"
+		$(PKG_EXTRA_KCONFIG) \
+		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \
+		V="$(V)" \
+		modules
+endef
+
+define KernelPackage/rt61-pci/install
+	$(INSTALL_DIR) $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rt2?61*.bin $(1)/lib/firmware/
+endef
+
+define KernelPackage/rt73-usb/install
+	$(INSTALL_DIR) $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rt73.bin $(1)/lib/firmware/
 endef
 
 $(eval $(call KernelPackage,rt2x00-lib))