X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2cd399391e226894d2f7b3837a0f0e1af5f151bc..a5dbd9c5b032fc309d16df00b97e5d79dccce1b0:/package/rt2x00/Makefile

diff --git a/package/rt2x00/Makefile b/package/rt2x00/Makefile
index 0d8229605..4d63963bc 100644
--- a/package/rt2x00/Makefile
+++ b/package/rt2x00/Makefile
@@ -12,25 +12,31 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=rt2x00
 PKG_VERSION:=cvs-20070712
 
-PKG_FW6X_NAME:=RT61_Firmware_V1.2.zip
-PKG_FW6X_URL:=http://www.ralinktech.com.tw/data/
-PKG_FW6X_MD5SUM:=d4c690c93b470bc9a681297c2adc6281
+include $(INCLUDE_DIR)/package.mk
 
-PKG_FW7X_NAME:=RT71W_Firmware_V1.8.zip
-PKG_FW7X_URL:=http://www.ralinktech.com.tw/data/
-PKG_FW7X_MD5SUM:=1e7a5dc574e0268574fcda3fd5cf52f7
 
-include $(INCLUDE_DIR)/package.mk
-ifeq ($(DUMP),)
-  include $(LINUX_DIR)/.config
-endif
+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
   TITLE:=Ralink Drivers for RT2x00 cards
   DEPENDS:=@LINUX_2_6 @!TARGET_atheros @!TARGET_uml
-  KCONFIG:=CONFIG_MAC80211
 endef
 
 define KernelPackage/rt2x00-lib
@@ -99,64 +105,43 @@ endef
 
 $(STAMP_PREPARED): $(DL_DIR)/$(PKG_FW6X_NAME) $(DL_DIR)/$(PKG_FW7X_NAME)
 
-$(DL_DIR)/$(PKG_FW6X_NAME):
-	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW6X_NAME)" "$(PKG_FW6X_MD5SUM)" $(PKG_FW6X_URL)
-
-$(DL_DIR)/$(PKG_FW7X_NAME):
-	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW7X_NAME)" "$(PKG_FW7X_MD5SUM)" $(PKG_FW7X_URL)
-
-# only try to build if the kernel is recent enough (has in-kernel mac80211)
-ifndef ($(CONFIG_MAC80211),)
-
-  PKG_EXTRA_KCONFIG:= \
+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:= \
+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/Compile/it
-	$(MAKE) -C "$(LINUX_DIR)" \
-		ARCH="$(LINUX_KARCH)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		SUBDIRS="$(PKG_BUILD_DIR)" \
-		$(PKG_EXTRA_KCONFIG) \
-		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \
-		V="$(V)" \
-		modules
-  endef
-
-endif
-
 define Build/Prepare
 	$(call Build/Prepare/Default)
-	$(CP) -r src/* $(PKG_BUILD_DIR)/
-	unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_FW6X_NAME)
-	unzip -jod $(PKG_BUILD_DIR) $(DL_DIR)/$(PKG_FW7X_NAME)
+	$(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
@@ -164,7 +149,14 @@ define Build/Configure
 endef
 
 define Build/Compile
-$(call Build/Compile/it)
+	$(MAKE) -C "$(LINUX_DIR)" \
+		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		SUBDIRS="$(PKG_BUILD_DIR)" \
+		$(PKG_EXTRA_KCONFIG) \
+		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \
+		V="$(V)" \
+		modules
 endef
 
 define KernelPackage/rt61-pci/install