X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/796a9d1091884a07817e5c140d0ff6a0b8c76235..6b20955cca6fb3518c4d77afb68938749fdf3201:/package/madwifi/Makefile?ds=sidebyside diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 433cb61e1..bb621ddf3 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -10,37 +10,39 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=madwifi -ifneq ($(CONFIG_MADWIFI_UPSTREAM),) - PKG_VERSION:=0.9.4 - PKG_RELEASE:=2 +PKG_REV:=3314 +PKG_VERSION:=r$(PKG_REV) +PKG_RELEASE:=5 - PKG_SOURCE:=madwifi-$(PKG_VERSION).tar.gz - PKG_SOURCE_URL:=http://downloads.sourceforge.net/madwifi/ - PKG_MD5SUM:=399d20de8d855a59f20058857c2178ad +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://madwifi-project.org/svn/madwifi/$(if $(PKG_BRANCH),branches/$(PKG_BRANCH),trunk) +PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz - PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/madwifi-$(PKG_VERSION) +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) - PATCH_DIR=./patches-upstream -else -# PKG_BRANCH:=madwifi-dfs - PKG_REV:=3314 - PKG_VERSION:=r$(PKG_REV) - PKG_RELEASE:=2 +HAL_VERSION:=20090508 +HAL_FILE:=ath_hal-$(HAL_VERSION).tgz +HAL_MD5SUM:=4ab7ae8bdb96c0be388c98bf8f92d5ca - 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_DEPENDS:=wprobe - PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) +include $(INCLUDE_DIR)/package.mk - PATCH_DIR=./patches +ifdef CONFIG_MADWIFI_COMPRESSION + COMPRESSION:=1 +else + COMPRESSION:=0 endif -PKG_BUILD_DEPENDS:=wprobe +define Download/hal + FILE:=$(HAL_FILE) + URL:=http://mirror2.openwrt.org/sources + MD5SUM:=$(HAL_MD5SUM) +endef +$(eval $(call Download,hal)) -include $(INCLUDE_DIR)/package.mk ifneq ($(CONFIG_TARGET_atheros),) BUS:=AHB @@ -50,11 +52,6 @@ else 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 - ifneq ($(CONFIG_CPU_MIPS32_R2),) ifeq ($(ARCH),mips) HAL_TARGET:=mips32r2-be-elf @@ -64,10 +61,10 @@ ifneq ($(CONFIG_CPU_MIPS32_R2),) endif else ifeq ($(ARCH),mips) - HAL_TARGET:=$(if $(CONFIG_MADWIFI_UPSTREAM),mips-be-elf,mips32-be-elf) + HAL_TARGET:=mips32-be-elf endif ifeq ($(ARCH),mipsel) - HAL_TARGET:=$(if $(CONFIG_MADWIFI_UPSTREAM),mips-le-elf,mips32-le-elf) + HAL_TARGET:=mips32-le-elf endif endif ifeq ($(ARCH),i386) @@ -82,13 +79,19 @@ endif ifeq ($(BOARD),iop32x) HAL_TARGET:=xscale-le-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi) endif +ifeq ($(BOARD),kirkwood) + HAL_TARGET:=xscale-le-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi) +endif ifeq ($(BOARD),orion) HAL_TARGET:=xscale-le-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi) endif +ifeq ($(BOARD),cns3xxx) + HAL_TARGET:=arm11-le-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi) +endif ifeq ($(ARCH),powerpc) HAL_TARGET:=powerpc-be-elf endif -ifeq ($(BOARD),storm) +ifeq ($(BOARD),gemini) HAL_TARGET:=armv4-le-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi) endif ifneq ($(CONFIG_TARGET_atheros),) @@ -111,19 +114,26 @@ ifdef CONFIG_MADWIFI_RCA_SAMPLERATE RATE_CONTROL:=sample endif +ifneq ($(CONFIG_MADWIFI_SINGLE_MODULE),) +MADWIFI_FILES:= $(PKG_BUILD_DIR)/ath_hal/ath_hal.ko +else 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:= \ + $(PKG_BUILD_DIR)/net80211/wlan.ko \ + $(PKG_BUILD_DIR)/net80211/wlan_scan_ap.ko \ + $(PKG_BUILD_DIR)/net80211/wlan_scan_sta.ko \ + $(PKG_BUILD_DIR)/ath_hal/ath_hal.ko \ + $(PKG_BUILD_DIR)/ath_rate/$(RATE_CONTROL)/ath_rate_$(RATE_CONTROL).ko \ + $(PKG_BUILD_DIR)/net80211/wlan_acl.ko \ + $(PKG_BUILD_DIR)/net80211/wlan_ccmp.ko \ + $(PKG_BUILD_DIR)/net80211/wlan_tkip.ko \ + $(PKG_BUILD_DIR)/net80211/wlan_wep.ko \ + $(PKG_BUILD_DIR)/net80211/wlan_xauth.ko +endif + +ifneq ($(CONFIG_MADWIFI_SINGLE_MODULE),) + MADWIFI_AUTOLOAD:= ath_hal +else + MADWIFI_AUTOLOAD:= \ wlan \ wlan_scan_ap \ wlan_scan_sta \ @@ -133,32 +143,32 @@ MADWIFI_AUTOLOAD:= \ wlan_ccmp \ wlan_tkip \ wlan_wep \ - wlan_xauth \ + wlan_xauth +endif ifeq ($(findstring AHB,$(BUS)),AHB) - MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX) + MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_ahb.ko MADWIFI_AUTOLOAD+= ath_ahb endif ifeq ($(findstring PCI,$(BUS)),PCI) - MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX) + MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_pci.ko MADWIFI_AUTOLOAD+= ath_pci endif -MADWIFI_APPLETS:=80211stats athchans athctrl athkey athstats wlanconfig ath_info +MADWIFI_APPLETS:=80211stats athchans athkey athstats wlanconfig ath_info madwifi_multi ifdef CONFIG_MADWIFI_DEBUG MADWIFI_APPLETS += athdebug 80211debug endif -ifndef CONFIG_MADWIFI_UPSTREAM - MADWIFI_APPLETS += madwifi_multi -endif 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 @LINUX_2_6 + URL:=http://madwifi-project.org/ + MAINTAINER:=Felix Fietkau + DEPENDS:=+wireless-tools @PCI_SUPPORT @(!(TARGET_avr32||TARGET_cobalt||TARGET_ep93xx||TARGET_etrax||TARGET_octeon||TARGET_pxcab||TARGET_sibyte)||BROKEN) FILES:=$(MADWIFI_FILES) AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD)) + MENU:=1 endef define KernelPackage/madwifi/description @@ -176,39 +186,36 @@ MADWIFI_INC = \ -I$(PKG_BUILD_DIR)/ath \ -I$(PKG_BUILD_DIR)/ath_hal \ -I$(PKG_BUILD_DIR)/net80211 \ - -I$(STAGING_DIR)/usr/include \ + -I$(STAGING_DIR)/usr/include/wprobe \ -include $(PKG_BUILD_DIR)/include/compat.h MAKE_ARGS:= \ PATH="$(TARGET_PATH)" \ ARCH="$(LINUX_KARCH)" \ + ARCH-y="$(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)" \ + ATH_RATE="$(RATE_CONTROL)" \ + ATH_CAP_SUPERG_COMP="$(COMPRESSION)" \ DO_MULTI=1 \ + SINGLE_MODULE=$(if $(CONFIG_MADWIFI_SINGLE_MODULE),1) \ INCS="$(MADWIFI_INC)" \ $(if $(CONFIG_MADWIFI_DEBUG),,DEBUG=) WARNINGS="-Wno-unused" MAKE_VARS:= \ - COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"' -DATH_REVERSE_ENGINEERING=1" \ + COPTS="-DATH_REVERSE_ENGINEERING=1" \ -ifeq ($(CONFIG_MADWIFI_UPSTREAM),) - HALFILE:=$(lastword $(sort $(wildcard ./ath_hal-*.tgz))) -endif - -ifneq ($(HALFILE),) - define Build/Prepare/HAL +define Build/Prepare/HAL rm -rf $(PKG_BUILD_DIR)/tmp mkdir -p $(PKG_BUILD_DIR)/tmp - tar xvzf $(HALFILE) -C $(PKG_BUILD_DIR)/tmp + tar xvzf $(DL_DIR)/$(HAL_FILE) -C $(PKG_BUILD_DIR)/tmp $(CP) $(PKG_BUILD_DIR)/tmp/ath_hal*/* $(PKG_BUILD_DIR)/hal/ rm -rf $(PKG_BUILD_DIR)/tmp - endef -endif +endef define Build/Prepare $(call Build/Prepare/Default) @@ -217,6 +224,7 @@ define Build/Prepare $(SED) 's, -E[LB],,' \ -e 's, -mips2,,' \ -e 's, -mapcs-32,,' \ + -e 's, -mlong-calls,,' \ $(PKG_BUILD_DIR)/hal/public/*.inc $(SED) 's,march=armv4,march=armv5te,' \ $(PKG_BUILD_DIR)/hal/public/xscale*.inc