X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=package%2Fmadwifi%2FMakefile;h=943a13c215263ce6a217982c56af10ea458c40f0;hb=a5fbb602d476c54718ceff0576772f841def79f5;hp=8d11cf1c9af0a170f75677933726809306738988;hpb=7afee719bf46c7ab910acdecd8dcea17917198a6;p=openwrt.git diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index 8d11cf1c9a..943a13c215 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -1,5 +1,5 @@ -# -# 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. @@ -10,18 +10,34 @@ 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:=2 + + 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:=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:=$(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) + PATCH_DIR=./patches +endif include $(INCLUDE_DIR)/package.mk @@ -38,11 +54,20 @@ 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 @@ -51,16 +76,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$(if $(CONFIG_EABI_SUPPORT),gnueabi) endif ifeq ($(ARCH),powerpc) HAL_TARGET:=powerpc-be-elf endif ifeq ($(BOARD),storm) - HAL_TARGET:=armv4-le-elf + HAL_TARGET:=armv4-le-elf$(if $(CONFIG_EABI_SUPPORT),gnueabi) endif ifneq ($(CONFIG_TARGET_atheros),) HAL_TARGET:=wisoc @@ -115,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 @@ -135,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:= \ @@ -151,30 +178,37 @@ 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 + DO_MULTI=1 \ + $(if $(CONFIG_MADWIFI_DEBUG),,DEBUG=) WARNINGS="-Wno-unused" MAKE_VARS:= \ COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"' -DATH_REVERSE_ENGINEERING=1" \ -HALFILE:=$(lastword $(sort $(wildcard ./ath_hal-*.tgz))) +ifeq ($(CONFIG_MADWIFI_UPSTREAM),) + HALFILE:=$(lastword $(sort $(wildcard ./ath_hal-*.tgz))) +endif + 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 $(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 -endif +endef ifeq ($(findstring AHB,$(BUS)),AHB) define Build/Compile/ahb @@ -207,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))