remove a wrong patch chunk in the madwifi update

[openwrt.git] / package / madwifi / Makefile

diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index 27c2952..a27af52 100644 (file)
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=madwifi
-PKG_REV:=3314
+PKG_REV:=$(if $(CONFIG_MADWIFI_TESTING),3776,3314)
 PKG_VERSION:=r$(PKG_REV)
 # PKG_BRANCH:=madwifi-dfs
 PKG_RELEASE:=1
@@ -23,6 +23,8 @@ 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-r$(PKG_REV),./patches)
+
 include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(CONFIG_TARGET_atheros),)
@@ -56,6 +58,9 @@ endif
 ifeq ($(BOARD),iop32x)
   HAL_TARGET:=xscale-le-elf
 endif
+ifeq ($(BOARD),orion)
+  HAL_TARGET:=xscale-le-elf
+endif
 ifeq ($(ARCH),powerpc)
   HAL_TARGET:=powerpc-be-elf
 endif
@@ -115,7 +120,7 @@ ifeq ($(findstring PCI,$(BUS)),PCI)
   MADWIFI_AUTOLOAD+= ath_pci
 endif
 
-MADWIFI_APPLETS:=80211stats,athchans,athctrl,athkey,athstats,wlanconfig
+MADWIFI_APPLETS:=80211stats,athchans,athctrl,athkey,athstats,wlanconfig,ath_info
 ifdef CONFIG_MADWIFI_DEBUG
   MADWIFI_APPLETS:=$(strip $(MADWIFI_APPLETS)),athdebug,80211debug
 endif
@@ -148,10 +153,14 @@ MAKE_ARGS:= \
        KERNELPATH="$(LINUX_DIR)" \
        LDOPTS="--no-warn-mismatch " \
        ATH_RATE="ath_rate/$(RATE_CONTROL)" \
-       WARNINGS="-Wno-unused" \
-       $(if $(CONFIG_MADWIFI_DEBUG),,DEBUG="") \
        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
+
 MAKE_VARS:= \
        COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"' -DATH_REVERSE_ENGINEERING=1" \
 
@@ -166,6 +175,7 @@ ifneq ($(HALFILE),)
        rm -rf $(PKG_BUILD_DIR)/tmp
        # patch cflags
        $(SED) 's, -E[LB],,' \
+               -e 's, -mips2,,' \
                -e 's, -mapcs-32,,' \
                $(PKG_BUILD_DIR)/hal/public/*.inc
        $(SED) 's,march=armv4,march=armv5te,' \