X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Fmadwifi%2FMakefile;h=f915f56f9fd833c40713fe41aa72d46764c6a514;hb=a81aed2f57aef263f83f31c8d405d086776f7415;hp=632b77fec500de434ae83c7af08c7bc7028e8377;hpb=0efdde7bb2f301c9928cc33555ed3e9bfef577fd;p=openwrt.git diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 632b77fec5..f915f56f9f 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -10,33 +10,18 @@ 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:=6 - PKG_SOURCE:=madwifi-$(PKG_VERSION).tar.gz - PKG_SOURCE_URL:=@SF/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_MIRROR_MD5SUM:=086b026d1c1561be8a949b79b0931404 - 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:=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://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=./patches -endif +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) HAL_VERSION:=20090508 HAL_FILE:=ath_hal-$(HAL_VERSION).tgz @@ -77,10 +62,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) @@ -89,21 +74,24 @@ endif ifeq ($(ARCH),i686) HAL_TARGET:=i386-elf endif -ifeq ($(BOARD),ixp4xx) - HAL_TARGET:=xscale-be-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi) +ifeq ($(ARCH),armeb) + HAL_TARGET:=xscale-be-elfgnueabi 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) +ifeq ($(ARCH),arm) + HAL_TARGET:=xscale-le-elfgnueabi + ifeq ($(BOARD),cns21xx) + HAL_TARGET:=armv4-le-elfgnueabi + endif + ifeq ($(BOARD),cns3xxx) + HAL_TARGET:=arm11-le-elfgnueabi + endif + ifeq ($(BOARD),gemini) + HAL_TARGET:=armv4-le-elfgnueabi + endif endif ifeq ($(ARCH),powerpc) HAL_TARGET:=powerpc-be-elf endif -ifeq ($(BOARD),gemini) - HAL_TARGET:=armv4-le-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi) -endif ifneq ($(CONFIG_TARGET_atheros),) HAL_TARGET:=wisoc endif @@ -125,19 +113,19 @@ ifdef CONFIG_MADWIFI_RCA_SAMPLERATE endif ifneq ($(CONFIG_MADWIFI_SINGLE_MODULE),) -MADWIFI_FILES:= $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) +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) + $(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),) @@ -157,29 +145,27 @@ else 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 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-project.org/ - DEPENDS:=+wireless-tools @PCI_SUPPORT||TARGET_atheros @!TARGET_avr32 @!TARGET_etrax @LINUX_2_6 + DEPENDS:=+wireless-tools @PCI_SUPPORT @(!(TARGET_avr32||TARGET_cobalt||TARGET_ep93xx||TARGET_etrax||TARGET_octeon||TARGET_pxcab||TARGET_sibyte)||BROKEN) +@DRIVER_WEXT_SUPPORT FILES:=$(MADWIFI_FILES) AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD)) + MENU:=1 endef define KernelPackage/madwifi/description @@ -220,15 +206,13 @@ MAKE_ARGS:= \ MAKE_VARS:= \ COPTS="-DATH_REVERSE_ENGINEERING=1" \ -ifeq ($(CONFIG_MADWIFI_UPSTREAM),) - define Build/Prepare/HAL +define Build/Prepare/HAL rm -rf $(PKG_BUILD_DIR)/tmp mkdir -p $(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)