rt2x00 fixes (thanks to sn9):

[openwrt.git] / package / mac80211 / Makefile

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 30f6093..6d72986 100644 (file)
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -15,11 +15,15 @@ PKG_RELEASE:=1
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)
 
 include $(INCLUDE_DIR)/package.mk

+ifeq ($(DUMP),)
+  include $(LINUX_DIR)/.config
+endif

 
 define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers
 
 define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers

-  TITLE:=DeviceScape 802.11 Wireless Networking Stack
-  DEPENDS:=@LINUX_2_6 +kmod-ieee80211
+  TITLE:=Linux 802.11 Wireless Networking Stack
+  DEPENDS:=@LINUX_2_6
+  KCONFIG:=CONFIG_MAC80211

   DESCRIPTION:=\
        This package contains the DeviceScape 80211 wireless stack.
   VERSION:=$(PKG_RELEASE)+$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)
   DESCRIPTION:=\
        This package contains the DeviceScape 80211 wireless stack.
   VERSION:=$(PKG_RELEASE)+$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)


@@ -28,7 +32,7 @@ define KernelPackage/mac80211
        $(PKG_BUILD_DIR)/mac80211/rc80211_lowest.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/mac80211/rc80211_simple.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)
        $(PKG_BUILD_DIR)/mac80211/rc80211_lowest.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/mac80211/rc80211_simple.$(LINUX_KMOD_SUFFIX) \
        $(PKG_BUILD_DIR)/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)

-  AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211 rc80211_lowest rc80211_simple)
+  AUTOLOAD:=$(call AutoLoad,20,cfg80211 mac80211 rc80211_simple)

 endef
 
 define Build/Prepare
 endef
 
 define Build/Prepare


@@ -38,25 +42,33 @@ define Build/Prepare
        $(CP) ./src/wireless/* $(PKG_BUILD_DIR)/wireless/
 endef
 
        $(CP) ./src/wireless/* $(PKG_BUILD_DIR)/wireless/
 endef
 

-MAKE_OPTS:=-C "$(LINUX_DIR)" \
+ifneq ($(CONFIG_MAC80211),)
+
+  MAKE_OPTS:= \

        CROSS_COMPILE="$(TARGET_CROSS)" \
        ARCH="$(LINUX_KARCH)" \
        CROSS_COMPILE="$(TARGET_CROSS)" \
        ARCH="$(LINUX_KARCH)" \

-       EXTRA_CFLAGS="$(BUILDFLAGS)"
+       EXTRA_CFLAGS="$(BUILDFLAGS) -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS" \
+       CONFIG_MAC80211=m \
+       CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \
+
+  define Build/Compile/it
+       $(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/wireless" modules
+       $(MAKE) -C "$(LINUX_DIR)" $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/mac80211" modules
+  endef
+
+endif

 
 define Build/Compile
 
 define Build/Compile

-       $(MAKE) $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/wireless" modules
-       $(MAKE) $(MAKE_OPTS) SUBDIRS="$(PKG_BUILD_DIR)/mac80211" modules
+       $(call Build/Compile/it)

 endef
 
 endef
 

-#define Build/InstallDev
-#      mkdir -p $(STAGING_DIR)/usr/include/madwifi
-#      $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/
-#      mkdir -p $(STAGING_DIR)/usr/include/madwifi/net80211
-#      $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/
-#endef
+define Build/InstallDev
+       mkdir -p $(STAGING_DIR)/usr/include/mac80211
+       $(CP) $(PKG_BUILD_DIR)/mac80211/{hostapd_ioctl,ieee80211_common}.h $(STAGING_DIR)/usr/include/mac80211/
+endef

 
 

-#define Build/UninstallDev
-#      rm -rf  $(STAGING_DIR)/usr/include/madwifi
-#endef
+define Build/UninstallDev
+       rm -rf  $(STAGING_DIR)/usr/include/mac80211
+endef

 
 $(eval $(call KernelPackage,mac80211))
 
 $(eval $(call KernelPackage,mac80211))