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
SVN-Revision: 8560
This commit is contained in:
parent
939c7224a2
commit
82914583a9
3 changed files with 12 additions and 46 deletions
|
@ -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
|
||||
|
|
|
@ -1,41 +0,0 @@
|
|||
# rt2x00 configuration
|
||||
# All configuration options can be enabled
|
||||
# by setting the value to 'y'. To disable
|
||||
# the option it should be set to 'n'.
|
||||
|
||||
#
|
||||
# RT2X00 generic support
|
||||
#
|
||||
|
||||
# Enable rt2x00 support
|
||||
CONFIG_RT2X00=y
|
||||
# Enable rt2x00 debug output
|
||||
CONFIG_RT2X00_DEBUG=y
|
||||
# Enable rt2x00 debugfs support
|
||||
CONFIG_RT2X00_DEBUGFS=n
|
||||
# Enable rt2x00 asm file creation
|
||||
CONFIG_RT2X00_ASM=n
|
||||
|
||||
#
|
||||
# RT2X00 driver support
|
||||
#
|
||||
# Enable rt2400pci support
|
||||
CONFIG_RT2400PCI=y
|
||||
# Enable rt2400pci hardware button support (requires rfkill)
|
||||
CONFIG_RT2400PCI_BUTTON=n
|
||||
|
||||
# Enable rt2500pci support
|
||||
CONFIG_RT2500PCI=y
|
||||
# Enable rt2500pci hardware button support (requires rfkill)
|
||||
CONFIG_RT2500PCI_BUTTON=n
|
||||
|
||||
# Enable rt2500usb support
|
||||
CONFIG_RT2500USB=y
|
||||
|
||||
# Enable rt61pci support
|
||||
CONFIG_RT61PCI=y
|
||||
# Enable rt61pci hardware button support (requires rfkill)
|
||||
CONFIG_RT61PCI_BUTTON=n
|
||||
|
||||
# Enable rt73usb support
|
||||
CONFIG_RT73USB=y
|
|
@ -38,7 +38,7 @@
|
|||
|
||||
#if (defined(CONFIG_RT2500USB) || defined(CONFIG_RT73USB))
|
||||
#if (!defined(CONFIG_USB) && !defined(CONFIG_USB_MODULE))
|
||||
#warning USB has been disabled in your kernel!
|
||||
#error USB has been disabled in your kernel!
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue