From 47c286261b0e1bb4b6efc72c237a370aaf36cbd7 Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 30 Aug 2007 22:24:16 +0000
Subject: more rt2x00 fixes (thanks to sn9):  * pkg: add missing kmod
 dependencies and autoloads  * src: change #warning to #error when checking
 kconfig  * src: remove uneeded config file

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8560 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/rt2x00/Makefile | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'package/rt2x00/Makefile')

diff --git a/package/rt2x00/Makefile b/package/rt2x00/Makefile
index fe1ee64eff..0338b9333b 100644
--- a/package/rt2x00/Makefile
+++ b/package/rt2x00/Makefile
@@ -39,12 +39,12 @@ $(call KernelPackage/rt2x00/Default)
   DEPENDS+= +kmod-mac80211 +kmod-crypto
   TITLE+= (LIB)
   FILES:=$(PKG_BUILD_DIR)/rt2x00lib.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,25,ecb arc4 rt2x00lib)
+  AUTOLOAD:=$(call AutoLoad,25,blkcipher ecb arc4 rt2x00lib)
 endef
 
 define KernelPackage/rt2x00-pci
 $(call KernelPackage/rt2x00/Default)
-  DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-lib
+  DEPENDS+= @PCI_SUPPORT +kmod-rt2x00-lib +kmod-eeprom-93cx6
   TITLE+= (PCI)
   FILES:=$(PKG_BUILD_DIR)/rt2x00pci.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,26,rt2x00pci)
@@ -76,7 +76,7 @@ endef
 
 define KernelPackage/rt2500-usb
 $(call KernelPackage/rt2x00/Default)
-  DEPENDS+= +kmod-rt2x00-usb
+  DEPENDS+= +kmod-rt2x00-usb +kmod-crc-itu-t
   TITLE+= (RT2500 USB)
   FILES:=$(PKG_BUILD_DIR)/rt2500usb.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,27,rt2500usb)
@@ -84,7 +84,7 @@ endef
 
 define KernelPackage/rt61-pci
 $(call KernelPackage/rt2x00/Default)
-  DEPENDS+= +kmod-rt2x00-pci
+  DEPENDS+= +kmod-rt2x00-pci +kmod-crc-itu-t
   TITLE+= (RT2x61 PCI)
   FILES:=$(PKG_BUILD_DIR)/rt61pci.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,27,rt61pci)
@@ -106,12 +106,19 @@ $(DL_DIR)/$(PKG_FW6X_NAME):
 $(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:= \
 	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
-- 
cgit v1.2.3