[kernel] upgrade to latest kernel versions (2.6.25.4; 2.6.24.7; 2.6.23.17; 2.6.22.19)

[openwrt.git] / package / madwifi / Makefile

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 7bdb7ec..09995e0 100644 (file)
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -1,119 +1,263 @@
+# 
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#

 # $Id$
 
 include $(TOPDIR)/rules.mk
 # $Id$
 
 include $(TOPDIR)/rules.mk

-include $(TOPDIR)/include/kernel.mk
+include $(INCLUDE_DIR)/kernel.mk

 
 PKG_NAME:=madwifi
 
 PKG_NAME:=madwifi

-PKG_VERSION:=0.9.0
+PKG_REV:=3314
+PKG_VERSION:=r$(PKG_REV)
+# PKG_BRANCH:=madwifi-dfs

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=9b558d1df84cab2b0006c595feee0fba

 
 

-PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_CAT:=bzcat
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION)
+PKG_SOURCE_URL:=http://svn.madwifi.org/madwifi/$(if $(PKG_BRANCH),branches/$(PKG_BRANCH),trunk)
+PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz

 
 

-PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION)

 
 

-ifeq ($(ARCH),mips)
-  HAL_TARGET:=mips-be-elf
+include $(INCLUDE_DIR)/package.mk
+
+ifdef CONFIG_MADWIFI_BUS_DEFAULT
+  ifneq ($(CONFIG_TARGET_atheros),)
+    BUS:=AHB
+  else
+    ifneq ($(CONFIG_PCI_SUPPORT),)
+      BUS:=PCI
+    endif
+  endif
+
+  # XXX: remove this check later when we have PCI support properly detected on all targets
+  ifneq ($(CONFIG_TARGET_ar7)$(CONFIG_TARGET_uml),)
+    BUS:=
+  endif
+else
+  ifdef CONFIG_MADWIFI_BUS_PCI
+    BUS:=PCI
+  else
+    ifdef CONFIG_MADWIFI_BUS_AHB
+      BUS:=AHB
+    endif
+  endif

 endif
 endif

-ifeq ($(ARCH),mipsel)
-  HAL_TARGET:=mips-le-elf
+
+ifdef CONFIG_MADWIFI_HAL_DEFAULT
+  ifeq ($(ARCH),mips)
+    HAL_TARGET:=mips-be-elf
+  endif
+  ifeq ($(ARCH),mipsel)
+    HAL_TARGET:=mips-le-elf
+  endif
+  ifeq ($(ARCH),i386)
+    HAL_TARGET:=i386-elf
+  endif
+  ifeq ($(ARCH),i686)
+    HAL_TARGET:=i386-elf
+  endif
+  ifeq ($(BOARD),ixp4xx)
+    HAL_TARGET:=xscale-be-elf
+  endif
+  ifeq ($(BOARD),iop32x)
+    HAL_TARGET:=xscale-le-elf
+  endif
+  ifeq ($(ARCH),powerpc)
+    HAL_TARGET:=powerpc-be-elf
+  endif
+  ifeq ($(BOARD),storm)
+    HAL_TARGET:=armv4-le-elf
+  endif
+  ifneq ($(CONFIG_TARGET_atheros),)
+    HAL_TARGET:=ap51
+  endif
+else
+  ifdef CONFIG_MADWIFI_HAL_MIPS_BE_ELF
+    HAL_TARGET:=mips-be-elf
+  endif
+
+  ifdef CONFIG_MADWIFI_HAL_MIPS_LE_ELF
+    HAL_TARGET:=mips-le-elf
+  endif
+
+  ifdef CONFIG_MADWIFI_HAL_I386_ELF
+    HAL_TARGET:=i386-elf
+  endif
+
+  ifdef CONFIG_MADWIFI_HAL_XSCALE_BE_ELF
+    HAL_TARGET:=xscale-be-elf
+  endif
+
+  ifdef CONFIG_MADWIFI_HAL_XSCALE_LE_ELF
+    HAL_TARGET:=xscale-le-elf
+  endif
+
+  ifdef CONFIG_MADWIFI_HAL_ARMV4_LE_ELF
+    HAL_TARGET:=armv4-le-elf
+  endif
+
+  ifdef CONFIG_MADWIFI_HAL_AP30
+    HAL_TARGET:=ap30
+  endif
+
+  ifdef CONFIG_MADWIFI_HAL_AP43
+    HAL_TARGET:=ap43
+  endif
+
+  ifdef CONFIG_MADWIFI_HAL_AP51
+    HAL_TARGET:=ap51
+  endif
+
+  ifdef CONFIG_MADWIFI_HAL_AP61
+    HAL_TARGET:=ap61
+  endif
+

 endif
 endif

-ifeq ($(ARCH),i386)
-  HAL_TARGET:=i386-elf
+
+ifdef CONFIG_MADWIFI_RCA_MINSTREL
+  RATE_CONTROL:=minstrel

 endif
 endif

-ifeq ($(ARCH),armeb)
-  HAL_TARGET:=xscale-be-elf
+
+ifdef CONFIG_MADWIFI_RCA_ONOE
+  RATE_CONTROL:=onoe

 endif
 
 endif
 

-BUS := PCI
-ifneq ($(CONFIG_LINUX_2_4_AR531X),)
-  BUS := AHB
+ifdef CONFIG_MADWIFI_RCA_AMRR
+  RATE_CONTROL:=amrr

 endif
 endif

-ifneq ($(CONFIG_LINUX_2_6_ARUBA),)
-  BUS := PCI AHB       # no suitable HAL for AHB yet.
+
+ifdef CONFIG_MADWIFI_RCA_SAMPLERATE
+  RATE_CONTROL:=sample

 endif
 
 endif
 

-BUS_MODULES:=
+MADWIFI_FILES:= \
+       $(PKG_BUILD_DIR)/net80211/wlan.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/net80211/wlan_scan_ap.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/net80211/wlan_scan_sta.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/ath_rate/$(RATE_CONTROL)/ath_rate_$(RATE_CONTROL).$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/net80211/wlan_acl.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/net80211/wlan_ccmp.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/net80211/wlan_tkip.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/net80211/wlan_wep.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/net80211/wlan_xauth.$(LINUX_KMOD_SUFFIX) \
+
+MADWIFI_AUTOLOAD:= \
+       wlan \
+       wlan_scan_ap \
+       wlan_scan_sta \
+       ath_hal \
+       ath_rate_$(RATE_CONTROL) \
+       wlan_acl \
+       wlan_ccmp \
+       wlan_tkip \
+       wlan_wep \
+       wlan_xauth \
+

 ifeq ($(findstring AHB,$(BUS)),AHB)
 ifeq ($(findstring AHB,$(BUS)),AHB)

-  BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX)
+  MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX)
+  MADWIFI_AUTOLOAD+= ath_ahb

 endif
 ifeq ($(findstring PCI,$(BUS)),PCI)
 endif
 ifeq ($(findstring PCI,$(BUS)),PCI)

-  BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX)
+  MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX)
+  MADWIFI_AUTOLOAD+= ath_pci

 endif
 
 endif
 

-MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \
-               PATH="$(TARGET_PATH)" \
-               ARCH="$(LINUX_KARCH)" \
-               CROSS_COMPILE="$(TARGET_CROSS)" \
-               TARGET="$(HAL_TARGET)" \
-               TOOLPREFIX="$(KERNEL_CROSS)" \
-               TOOLPATH="$(KERNEL_CROSS)" \
-               KERNELPATH="$(LINUX_DIR)" \
-               LDOPTS="" \
-               DOMULTI=1
+MADWIFI_APPLETS:=80211stats,athchans,athctrl,athkey,athstats,wlanconfig
+ifdef CONFIG_MADWIFI_DEBUG
+  MADWIFI_APPLETS:=$(strip $(MADWIFI_APPLETS)),athdebug,80211debug
+endif

 
 

-include $(TOPDIR)/include/package.mk

 
 

-ifeq ($(findstring AHB,$(BUS)),AHB)
-define Build/Compile/ahb
-       $(MAKE) $(MADWIFI_MAKEOPTS) BUS="AHB" all
+define KernelPackage/madwifi
+  SUBMENU:=Wireless Drivers
+  TITLE:=Driver for Atheros wireless chipsets
+  URL:=http://madwifi.org/
+  DEPENDS:=+wireless-tools @PCI_SUPPORT||TARGET_atheros @!TARGET_ar7 @!TARGET_avr32 @!TARGET_etrax @!TARGET_uml
+  FILES:=$(MADWIFI_FILES)
+  AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD))

 endef
 endef

-endif

 
 

-ifeq ($(findstring PCI,$(BUS)),PCI)
-define Build/Compile/pci
-       $(MAKE) $(MADWIFI_MAKEOPTS) BUS="PCI" all
+define KernelPackage/madwifi/description
+ This package contains a driver for Atheros 802.11a/b/g chipsets.

 endef
 endef

-endif

 
 

-define Build/Compile
-$(call Build/Compile/ahb)
-$(call Build/Compile/pci)
+define KernelPackage/madwifi/config
+       menu "MadWifi Configuration"
+               depends on PACKAGE_kmod-madwifi
+               source "$(SOURCE)/Config.in"
+       endmenu

 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
+MAKE_ARGS:= \
+       PATH="$(TARGET_PATH)" \
+       ARCH="$(LINUX_KARCH)" \
+       CROSS_COMPILE="$(TARGET_CROSS)" \
+       TARGET="$(HAL_TARGET)" \
+       TOOLPREFIX="$(KERNEL_CROSS)" \
+       TOOLPATH="$(KERNEL_CROSS)" \
+       KERNELPATH="$(LINUX_DIR)" \
+       LDOPTS="--no-warn-mismatch " \
+       ATH_RATE="ath_rate/$(RATE_CONTROL)" \
+       WARNINGS="-Wno-unused" \
+       $(if $(CONFIG_MADWIFI_DEBUG),,DEBUG="") \
+       DOMULTI=1

 
 

-define Build/UninstallDev
-       rm -rf $(STAGING_DIR)/usr/include/madwifi
-endef
+MAKE_VARS:= \
+       COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"'" \

 
 

-define Package/kmod-madwifi
- SECTION:=drivers
- CATEGORY:=Drivers
- DEFAULT:=y if LINUX_2_6_BRCM || LINUX_2_6_ARUBA || LINUX_2_4_AR531X || LINUX_2_6_XSCALE, m if ALL
- TITLE:=Driver for Atheros wireless chipsets
- DESCRIPTION:=Driver for Atheros 802.11a/b/g chipsets
- URL:=http://madwifi.org/
- VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE)
-endef
+HALFILE:=$(lastword $(sort $(wildcard ./ath_hal-*.tgz)))
+ifneq ($(HALFILE),)
+  define Build/Prepare
+       $(call Build/Prepare/Default)
+       rm -rf $(PKG_BUILD_DIR)/tmp
+       mkdir -p $(PKG_BUILD_DIR)/tmp
+       tar xvzf $(HALFILE) -C $(PKG_BUILD_DIR)/tmp
+       $(CP) $(PKG_BUILD_DIR)/tmp/ath_hal*/* $(PKG_BUILD_DIR)/hal/
+       rm -rf $(PKG_BUILD_DIR)/tmp
+  endef
+endif

 
 

-define Package/kmod-madwifi/install
-       mkdir -p $(1)/etc/modules.d
-       mkdir -p $(1)/etc/init.d
-       mkdir -p $(1)/lib/modules/$(LINUX_VERSION)
-       mkdir -p $(1)/usr/sbin
-       install -m0644 ./files/madwifi.modules $(1)/etc/modules.d/20-madwifi

 ifeq ($(findstring AHB,$(BUS)),AHB)
 ifeq ($(findstring AHB,$(BUS)),AHB)

-       echo ath_ahb >> $(1)/etc/modules.d/20-madwifi
+  define Build/Compile/ahb
+       $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) BUS="AHB" modules
+       $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) CFLAGS="$(TARGET_CFLAGS)" tools
+  endef

 endif
 endif

+

 ifeq ($(findstring PCI,$(BUS)),PCI)
 ifeq ($(findstring PCI,$(BUS)),PCI)

-       echo ath_pci >> $(1)/etc/modules.d/20-madwifi
+  define Build/Compile/pci
+       $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) BUS="PCI" modules
+       $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) CFLAGS="$(TARGET_CFLAGS)" tools
+  endef

 endif
 endif

-       install -m0755 ./files/madwifi.init $(1)/etc/init.d/S20madwifi
-       $(CP) \
-               $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
-               $(BUS_MODULES) \
-               $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \
-               $(PKG_BUILD_DIR)/net80211/*.$(LINUX_KMOD_SUFFIX) \
-               $(1)/lib/modules/$(LINUX_VERSION)/
-       $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211debug,80211stats,athchans,athctrl,athdebug,athkey,athstats,wlanconfig} $(1)/usr/sbin/
+
+define Build/Configure
+       $(SED) 's,-E[LB] ,,g' $(PKG_BUILD_DIR)/hal/public/*.inc
+endef
+
+define Build/Compile
+       $(call Build/Compile/ahb)
+       $(call Build/Compile/pci)
+endef
+
+define Build/InstallDev
+       mkdir -p $(1)/usr/include/madwifi
+       $(CP) $(PKG_BUILD_DIR)/include $(1)/usr/include/madwifi/
+       mkdir -p $(1)/usr/include/madwifi/net80211
+       $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(1)/usr/include/madwifi/net80211/
+endef
+
+define KernelPackage/madwifi/install
+       $(INSTALL_DIR) $(1)/lib/wifi
+       $(INSTALL_DATA) ./files/lib/wifi/madwifi.sh $(1)/lib/wifi
+       $(INSTALL_DIR) $(1)/usr/sbin
+       $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,$(MADWIFI_APPLETS)} $(1)/usr/sbin/

 endef
 
 endef
 

-$(eval $(call BuildPackage,kmod-madwifi))
+$(eval $(call KernelPackage,madwifi))