aboutsummaryrefslogtreecommitdiffstats
path: root/package/rt2x00
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-11-10 15:23:02 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-11-10 15:23:02 +0000
commitddb3d3705da728fc0638d39d699e5550748d5689 (patch)
tree4f0da49f74a69bfc7efb58b9eca6edfbac7c6a2b /package/rt2x00
parent04ad386f482bf1579332462cd3d993c77be6c635 (diff)
downloadupstream-ddb3d3705da728fc0638d39d699e5550748d5689.tar.gz
upstream-ddb3d3705da728fc0638d39d699e5550748d5689.tar.bz2
upstream-ddb3d3705da728fc0638d39d699e5550748d5689.zip
clean up mac80211 related kernel version deps
SVN-Revision: 9522
Diffstat (limited to 'package/rt2x00')
-rw-r--r--package/rt2x00/Makefile74
1 files changed, 32 insertions, 42 deletions
diff --git a/package/rt2x00/Makefile b/package/rt2x00/Makefile
index 1e95e27a9e..fb0bd48d59 100644
--- a/package/rt2x00/Makefile
+++ b/package/rt2x00/Makefile
@@ -27,7 +27,6 @@ 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
@@ -102,53 +101,37 @@ $(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:= \
+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
- 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)/
@@ -161,7 +144,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