X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fmadwifi%2FMakefile;h=e6d13a936b574a323aa289888fe1f1f09ab7a8a5;hp=ad7f5c9ba3c2e2f2e5f9572e17b4683d3cedc11b;hb=98ace42f30a03087843c42122cd3bbeff3e5946a;hpb=621f114b34d852e88f339e77726d6aa0264ea19a diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index ad7f5c9ba3..e6d13a936b 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,28 +10,64 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=madwifi -PKG_REV:=3252 -PKG_VERSION:=r$(PKG_REV) -PKG_BRANCH:=madwifi-dfs -PKG_RELEASE:=1 -PKG_SOURCE_PROTO:=svn -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi)-$(PKG_VERSION) -PKG_SOURCE_URL:=http://svn.madwifi.org/madwifi/$(if $(PKG_BRANCH),branches/$(PKG_BRANCH),trunk) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz +ifneq ($(CONFIG_MADWIFI_UPSTREAM),) + PKG_VERSION:=0.9.4 + PKG_RELEASE:=1 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BRANCH)-$(PKG_VERSION) + PKG_SOURCE:=madwifi-$(PKG_VERSION).tar.gz + PKG_SOURCE_URL:=http://downloads.sourceforge.net/madwifi/ + PKG_MD5SUM:=399d20de8d855a59f20058857c2178ad + + PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/madwifi-$(PKG_VERSION) + + PATCH_DIR=./patches-upstream +else +# PKG_BRANCH:=madwifi-dfs + PKG_REV:=3314 + PKG_VERSION:=r$(PKG_REV) + PKG_RELEASE:=1 + + 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)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) + + PATCH_DIR=./patches +endif include $(INCLUDE_DIR)/package.mk -# MADWIFI_DEBUG=1 +ifneq ($(CONFIG_TARGET_atheros),) + BUS:=AHB +else + ifneq ($(CONFIG_PCI_SUPPORT),) + BUS:=PCI + endif +endif -ifeq ($(ARCH),mips) - HAL_TARGET:=mips-be-elf +# 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),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 @@ -39,31 +75,40 @@ endif ifeq ($(ARCH),i686) HAL_TARGET:=i386-elf endif -ifeq ($(ARCH),armeb) - HAL_TARGET:=xscale-be-elf +ifeq ($(BOARD),ixp4xx) + HAL_TARGET:=xscale-be-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi) endif -ifeq ($(ARCH),arm) - HAL_TARGET:=xscale-le-elf +ifeq ($(BOARD),iop32x) + 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 ($(ARCH),powerpc) HAL_TARGET:=powerpc-be-elf endif - +ifeq ($(BOARD),storm) + HAL_TARGET:=armv4-le-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi) +endif ifneq ($(CONFIG_TARGET_atheros),) - BUS:=AHB - HAL_TARGET:=ap51 -else - ifneq ($(CONFIG_PCI_SUPPORT),) - BUS:=PCI - endif + HAL_TARGET:=wisoc endif -# XXX: remove this check later when we have PCI support properly detected on all targets -ifneq ($(CONFIG_TARGET_uml),) - BUS:= +ifdef CONFIG_MADWIFI_RCA_MINSTREL + RATE_CONTROL:=minstrel +endif + +ifdef CONFIG_MADWIFI_RCA_ONOE + RATE_CONTROL:=onoe endif -RATE_CONTROL:=minstrel +ifdef CONFIG_MADWIFI_RCA_AMRR + RATE_CONTROL:=amrr +endif + +ifdef CONFIG_MADWIFI_RCA_SAMPLERATE + RATE_CONTROL:=sample +endif MADWIFI_FILES:= \ $(PKG_BUILD_DIR)/net80211/wlan.$(LINUX_KMOD_SUFFIX) \ @@ -98,17 +143,19 @@ ifeq ($(findstring PCI,$(BUS)),PCI) MADWIFI_AUTOLOAD+= ath_pci endif -MADWIFI_APPLETS:=80211stats,athchans,athctrl,athkey,athstats,wlanconfig -ifneq ($(MADWIFI_DEBUG),) - MADWIFI_APPLETS:=$(strip $(MADWIFI_APPLETS)),athdebug,80211debug +MADWIFI_APPLETS:=80211stats athchans athctrl athkey athstats wlanconfig ath_info +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_avr32 @!TARGET_etrax @!TARGET_uml + 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 @@ -117,6 +164,10 @@ define KernelPackage/madwifi/description This package contains a driver for Atheros 802.11a/b/g chipsets. endef +define KernelPackage/madwifi/config + source "$(SOURCE)/Config.in" +endef + MAKE_ARGS:= \ PATH="$(TARGET_PATH)" \ ARCH="$(LINUX_KARCH)" \ @@ -127,12 +178,37 @@ MAKE_ARGS:= \ KERNELPATH="$(LINUX_DIR)" \ LDOPTS="--no-warn-mismatch " \ ATH_RATE="ath_rate/$(RATE_CONTROL)" \ - WARNINGS="-Wno-unused" \ - $(if $(MADWIFI_DEBUG),,DEBUG="") \ - DOMULTI=1 + DO_MULTI=1 \ + $(if $(CONFIG_MADWIFI_DEBUG),,DEBUG=) WARNINGS="-Wno-unused" MAKE_VARS:= \ - COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"'" \ + 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 + $(CP) $(PKG_BUILD_DIR)/tmp/ath_hal*/* $(PKG_BUILD_DIR)/hal/ + rm -rf $(PKG_BUILD_DIR)/tmp + endef +endif + +define Build/Prepare + $(call Build/Prepare/Default) + $(call Build/Prepare/HAL) + # 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,' \ + $(PKG_BUILD_DIR)/hal/public/xscale*.inc +endef ifeq ($(findstring AHB,$(BUS)),AHB) define Build/Compile/ahb @@ -165,10 +241,9 @@ define Build/InstallDev 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/ + $(CP) ./files/* $(1)/ + $(CP) $(foreach applet,$(MADWIFI_APPLETS),$(PKG_BUILD_DIR)/tools/$(applet)) $(1)/usr/sbin/ endef $(eval $(call KernelPackage,madwifi))