X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0270f3b748fd48acb016351f572ecf11e963f87c..ba38e0585024837bc59c618bdd2adfd42d2d9af8:/package/madwifi/Makefile?ds=inline diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 699a4afd0..250c6fd68 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -1,10 +1,9 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org +# +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# $Id$ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk @@ -13,10 +12,10 @@ PKG_NAME:=madwifi ifneq ($(CONFIG_MADWIFI_UPSTREAM),) PKG_VERSION:=0.9.4 - PKG_RELEASE:=1 + PKG_RELEASE:=2 PKG_SOURCE:=madwifi-$(PKG_VERSION).tar.gz - PKG_SOURCE_URL:=http://downloads.sourceforge.net/madwifi/ + PKG_SOURCE_URL:=@SF/madwifi PKG_MD5SUM:=399d20de8d855a59f20058857c2178ad PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/madwifi-$(PKG_VERSION) @@ -24,23 +23,43 @@ ifneq ($(CONFIG_MADWIFI_UPSTREAM),) PATCH_DIR=./patches-upstream else # PKG_BRANCH:=madwifi-dfs - PKG_REV:=$(if $(CONFIG_MADWIFI_TESTING),3776,3314) + PKG_REV:=3314 PKG_VERSION:=r$(PKG_REV) - PKG_RELEASE:=1 + PKG_RELEASE:=2 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_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)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) - PATCH_DIR=$(if $(CONFIG_MADWIFI_TESTING),./patches-testing,./patches) + PATCH_DIR=./patches endif +HAL_VERSION:=20090508 +HAL_FILE:=ath_hal-$(HAL_VERSION).tgz +HAL_MD5SUM:=4ab7ae8bdb96c0be388c98bf8f92d5ca + +PKG_BUILD_DEPENDS:=wprobe + include $(INCLUDE_DIR)/package.mk +ifdef CONFIG_MADWIFI_COMPRESSION + COMPRESSION:=1 +else + COMPRESSION:=0 +endif + +define Download/hal + FILE:=$(HAL_FILE) + URL:=http://mirror2.openwrt.org/sources + MD5SUM:=$(HAL_MD5SUM) +endef +$(eval $(call Download,hal)) + + ifneq ($(CONFIG_TARGET_atheros),) BUS:=AHB else @@ -49,16 +68,20 @@ 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 - -ifeq ($(ARCH),mips) - HAL_TARGET:=mips-be-elf -endif -ifeq ($(ARCH),mipsel) - HAL_TARGET:=mips-le-elf +ifneq ($(CONFIG_CPU_MIPS32_R2),) + ifeq ($(ARCH),mips) + HAL_TARGET:=mips32r2-be-elf + endif + ifeq ($(ARCH),mipsel) + HAL_TARGET:=mips32r2-le-elf + endif +else + ifeq ($(ARCH),mips) + HAL_TARGET:=$(if $(CONFIG_MADWIFI_UPSTREAM),mips-be-elf,mips32-be-elf) + endif + ifeq ($(ARCH),mipsel) + HAL_TARGET:=$(if $(CONFIG_MADWIFI_UPSTREAM),mips-le-elf,mips32-le-elf) + endif endif ifeq ($(ARCH),i386) HAL_TARGET:=i386-elf @@ -67,19 +90,19 @@ ifeq ($(ARCH),i686) HAL_TARGET:=i386-elf endif ifeq ($(BOARD),ixp4xx) - HAL_TARGET:=xscale-be-elf + HAL_TARGET:=xscale-be-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi) endif ifeq ($(BOARD),iop32x) - HAL_TARGET:=xscale-le-elf + HAL_TARGET:=xscale-le-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi) endif ifeq ($(BOARD),orion) - HAL_TARGET:=xscale-le-elf + HAL_TARGET:=xscale-le-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi) endif ifeq ($(ARCH),powerpc) HAL_TARGET:=powerpc-be-elf endif -ifeq ($(BOARD),storm) - HAL_TARGET:=armv4-le-elf +ifeq ($(BOARD),gemini) + HAL_TARGET:=armv4-le-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi) endif ifneq ($(CONFIG_TARGET_atheros),) HAL_TARGET:=wisoc @@ -134,7 +157,7 @@ ifeq ($(findstring PCI,$(BUS)),PCI) MADWIFI_AUTOLOAD+= ath_pci endif -MADWIFI_APPLETS:=80211stats athchans athctrl athkey athstats wlanconfig $(if $(CONFIG_MADWIFI_TESTING),ath_info/)ath_info +MADWIFI_APPLETS:=80211stats athchans athkey athstats wlanconfig ath_info ifdef CONFIG_MADWIFI_DEBUG MADWIFI_APPLETS += athdebug 80211debug endif @@ -145,8 +168,8 @@ 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 + URL:=http://madwifi-project.org/ + DEPENDS:=+wireless-tools @PCI_SUPPORT||TARGET_atheros @!TARGET_avr32 @!TARGET_etrax @LINUX_2_6 FILES:=$(MADWIFI_FILES) AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD)) endef @@ -159,9 +182,20 @@ define KernelPackage/madwifi/config source "$(SOURCE)/Config.in" endef +MADWIFI_INC = \ + -I$(PKG_BUILD_DIR) \ + -I$(PKG_BUILD_DIR)/include \ + -I$(PKG_BUILD_DIR)/hal \ + -I$(PKG_BUILD_DIR)/ath \ + -I$(PKG_BUILD_DIR)/ath_hal \ + -I$(PKG_BUILD_DIR)/net80211 \ + -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)" \ @@ -169,26 +203,19 @@ MAKE_ARGS:= \ KERNELPATH="$(LINUX_DIR)" \ LDOPTS="--no-warn-mismatch " \ ATH_RATE="ath_rate/$(RATE_CONTROL)" \ - DO_MULTI=1 - -ifneq ($(CONFIG_MADWIFI_TESTING),) - MAKE_ARGS += $(if $(CONFIG_MADWIFI_DEBUG),,ATH_DEBUG=) -else - MAKE_ARGS += $(if $(CONFIG_MADWIFI_DEBUG),,DEBUG=) WARNINGS="-Wno-unused" -endif + ATH_CAP_SUPERG_COMP="$(COMPRESSION)" \ + DO_MULTI=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" \ ifeq ($(CONFIG_MADWIFI_UPSTREAM),) - HALFILE:=$(lastword $(sort $(wildcard ./ath_hal-*.tgz))) -endif - -ifneq ($(HALFILE),) 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 @@ -201,6 +228,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