X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/2d6e73eaf2006f979662589bbc0f8e9fc8f1fe70..495ea3c8471821855f1fc06ef5f66ffa05fabe62:/package/madwifi/Makefile?ds=sidebyside diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index ef83702a8..e6d13a936 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -10,113 +10,88 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=madwifi -PKG_REV:=3314 -PKG_VERSION:=r$(PKG_REV) + +ifneq ($(CONFIG_MADWIFI_UPSTREAM),) + PKG_VERSION:=0.9.4 + PKG_RELEASE:=1 + + 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_RELEASE:=1 + 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_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) + PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) -include $(INCLUDE_DIR)/package.mk + PATCH_DIR=./patches +endif -ifdef CONFIG_MADWIFI_BUS_DEFAULT - ifneq ($(CONFIG_TARGET_atheros),) - BUS:=AHB - else - ifneq ($(CONFIG_PCI_SUPPORT),) - BUS:=PCI - endif - endif +include $(INCLUDE_DIR)/package.mk - # 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_TARGET_atheros),) + BUS:=AHB else - ifdef CONFIG_MADWIFI_BUS_PCI + ifneq ($(CONFIG_PCI_SUPPORT),) BUS:=PCI - else - ifdef CONFIG_MADWIFI_BUS_AHB - BUS:=AHB - endif endif endif -ifdef CONFIG_MADWIFI_HAL_DEFAULT +# 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:=mips-be-elf + HAL_TARGET:=mips32r2-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 + HAL_TARGET:=mips32r2-le-elf 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 + ifeq ($(ARCH),mips) + HAL_TARGET:=$(if $(CONFIG_MADWIFI_UPSTREAM),mips-be-elf,mips32-be-elf) endif - - ifdef CONFIG_MADWIFI_HAL_AP61 - HAL_TARGET:=ap61 + ifeq ($(ARCH),mipsel) + HAL_TARGET:=$(if $(CONFIG_MADWIFI_UPSTREAM),mips-le-elf,mips32-le-elf) endif - +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$(if $(CONFIG_EABI_SUPPORT),gnueabi) +endif +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),) + HAL_TARGET:=wisoc endif ifdef CONFIG_MADWIFI_RCA_MINSTREL @@ -168,11 +143,13 @@ 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 + MADWIFI_APPLETS += athdebug 80211debug +endif +ifndef CONFIG_MADWIFI_UPSTREAM + MADWIFI_APPLETS += madwifi_multi endif - define KernelPackage/madwifi SUBMENU:=Wireless Drivers @@ -188,10 +165,7 @@ define KernelPackage/madwifi/description endef define KernelPackage/madwifi/config - menu "MadWifi Configuration" - depends on PACKAGE_kmod-madwifi - source "$(SOURCE)/Config.in" - endmenu + source "$(SOURCE)/Config.in" endef MAKE_ARGS:= \ @@ -204,17 +178,18 @@ MAKE_ARGS:= \ KERNELPATH="$(LINUX_DIR)" \ LDOPTS="--no-warn-mismatch " \ ATH_RATE="ath_rate/$(RATE_CONTROL)" \ - WARNINGS="-Wno-unused" \ - $(ifndef CONFIG_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 -HALFILE:=$(lastword $(sort $(wildcard ./ath_hal-*.tgz))) ifneq ($(HALFILE),) - define Build/Prepare - $(call Build/Prepare/Default) + define Build/Prepare/HAL rm -rf $(PKG_BUILD_DIR)/tmp mkdir -p $(PKG_BUILD_DIR)/tmp tar xvzf $(HALFILE) -C $(PKG_BUILD_DIR)/tmp @@ -223,6 +198,18 @@ ifneq ($(HALFILE),) 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 $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) BUS="AHB" modules @@ -254,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))