X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=package%2Fmadwifi%2FMakefile;h=f4f7fcd8b615a9323dbb9704c9276d4365b50915;hp=b9dc5d7287b8c020ece14f91bf44afe9347a1972;hb=2e797dd8b25547ad8da154e309ecfaac69871414;hpb=a90db08b177e1eeb37a23fcccd74baf708b49d68 diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index b9dc5d7287..f4f7fcd8b6 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -10,20 +10,18 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=madwifi -PKG_VERSION:=0.9.2.1 -PKG_RELEASE:=1 +PKG_VERSION:=r2568-20070710 +PKG_BRANCH:=madwifi-ng +PKG_RELEASE:=2 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_MD5SUM:=bf5509fccd3852e22551826063b1b61e -PKG_CAT:=bzcat +PKG_SOURCE:=$(PKG_BRANCH)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://snapshots.madwifi.org/$(PKG_BRANCH) +PKG_MD5SUM:=fe5d41acd085d2c46934be3f8839e694 -PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_BRANCH)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk -RATE_CONTROL:=sample - ifeq ($(ARCH),mips) HAL_TARGET:=mips-be-elf endif @@ -36,27 +34,41 @@ endif ifeq ($(ARCH),armeb) HAL_TARGET:=xscale-be-elf endif +ifeq ($(ARCH),arm) + HAL_TARGET:=xscale-le-elf +endif ifeq ($(ARCH),powerpc) HAL_TARGET:=powerpc-be-elf endif -BUS:=PCI -ifneq ($(CONFIG_LINUX_2_6_ATHEROS),) +ifneq ($(CONFIG_TARGET_atheros),) BUS:=AHB HAL_TARGET:=ap51 -endif -ifneq ($(CONFIG_LINUX_2_6_ARUBA),) - BUS:=PCI AHB # no suitable HAL for AHB yet. +else + ifneq ($(CONFIG_PCI_SUPPORT),) + BUS:=PCI + endif endif -BUS_MODULES:= -ifeq ($(findstring AHB,$(BUS)),AHB) - BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX) -endif -ifeq ($(findstring PCI,$(BUS)),PCI) - BUS_MODULES+=$(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX) +# XXX: remove this check later when we have PCI support properly detected on all targets +ifneq ($(CONFIG_TARGET_uml),) + BUS:= endif +RATE_CONTROL:=minstrel + +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) \ + MADWIFI_AUTOLOAD:= \ wlan \ wlan_scan_ap \ @@ -67,76 +79,92 @@ MADWIFI_AUTOLOAD:= \ wlan_ccmp \ wlan_tkip \ wlan_wep \ - wlan_xauth + wlan_xauth \ ifeq ($(findstring AHB,$(BUS)),AHB) - MADWIFI_AUTOLOAD += ath_ahb + MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_ahb.$(LINUX_KMOD_SUFFIX) + MADWIFI_AUTOLOAD+= ath_ahb endif ifeq ($(findstring PCI,$(BUS)),PCI) - MADWIFI_AUTOLOAD += ath_pci + MADWIFI_FILES+= $(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX) + MADWIFI_AUTOLOAD+= ath_pci endif define KernelPackage/madwifi SUBMENU:=Wireless Drivers TITLE:=Driver for Atheros wireless chipsets - DEPENDS:=+wireless-tools - DESCRIPTION:=\ - This package contains a driver for Atheros 802.11a/b/g chipsets. URL:=http://madwifi.org/ - VERSION:=$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE) - FILES:= \ - $(PKG_BUILD_DIR)/ath/ath_hal.$(LINUX_KMOD_SUFFIX) \ - $(BUS_MODULES) \ - $(PKG_BUILD_DIR)/ath_rate/$(RATE_CONTROL)/ath_rate_$(RATE_CONTROL).$(LINUX_KMOD_SUFFIX) \ - $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) + DEPENDS:=+wireless-tools @PCI_SUPPORT||TARGET_atheros @!TARGET_avr32 @!TARGET_etrax @!TARGET_uml + FILES:=$(MADWIFI_FILES) AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD)) endef -MADWIFI_MAKEOPTS= -C $(PKG_BUILD_DIR) \ - PATH="$(TARGET_PATH)" \ - ARCH="$(LINUX_KARCH)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - TARGET="$(HAL_TARGET)" \ - TOOLPREFIX="$(KERNEL_CROSS)" \ - TOOLPATH="$(KERNEL_CROSS)" \ - KERNELPATH="$(LINUX_DIR)" \ - LDOPTS="--no-warn-mismatch " \ - ATH_RATE="ath_rate/$(RATE_CONTROL)" \ - DOMULTI=1 +define KernelPackage/madwifi/description + This package contains a driver for Atheros 802.11a/b/g chipsets. +endef + +define KernelPackage/madwifi-karma + $(call KernelPackage/madwifi) + TITLE:=Madwifi for Karma support + URL:=http://www.digininja.org/ +endef + +define KernelPackage/madwifi-karma/description + This package contains a modified driver to be used with + the Karma software for Atheros 802.11a/b/g chipsets. +endef + +MAKE_ARGS:= \ + PATH="$(TARGET_PATH)" \ + ARCH="$(LINUX_KARCH)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + TARGET="$(HAL_TARGET)" \ + TOOLPREFIX="$(KERNEL_CROSS)" \ + TOOLPATH="$(KERNEL_CROSS)" \ + KERNELPATH="$(LINUX_DIR)" \ + LDOPTS="--no-warn-mismatch " \ + ATH_RATE="ath_rate/$(RATE_CONTROL)" \ + WARNINGS="" \ + DOMULTI=1 + +MAKE_VARS:= \ + COPTS="-DCONFIG_ATHEROS_RATE_DEFAULT='\"$(RATE_CONTROL)\"'" \ ifeq ($(findstring AHB,$(BUS)),AHB) define Build/Compile/ahb - $(MAKE) $(MADWIFI_MAKEOPTS) BUS="AHB" modules + $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) BUS="AHB" modules + $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) CFLAGS="$(TARGET_CFLAGS)" tools endef endif ifeq ($(findstring PCI,$(BUS)),PCI) define Build/Compile/pci - $(MAKE) $(MADWIFI_MAKEOPTS) BUS="PCI" modules + $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) BUS="PCI" modules + $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_ARGS) CFLAGS="$(TARGET_CFLAGS)" tools endef endif define Build/Configure $(SED) 's,-E[LB] ,,g' $(PKG_BUILD_DIR)/hal/public/*.inc +ifneq ($(CONFIG_PACKAGE_kmod-madwifi-karma),) + $(PATCH) $(PKG_BUILD_DIR) ./files +endif endef define Build/Compile $(call Build/Compile/ahb) $(call Build/Compile/pci) - $(MAKE) $(MADWIFI_MAKEOPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - tools endef define Build/InstallDev - mkdir -p $(STAGING_DIR)/usr/include/madwifi - $(CP) $(PKG_BUILD_DIR)/include $(STAGING_DIR)/usr/include/madwifi/ - mkdir -p $(STAGING_DIR)/usr/include/madwifi/net80211 - $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(STAGING_DIR)/usr/include/madwifi/net80211/ + mkdir -p $(1)/usr/include/madwifi + $(CP) $(PKG_BUILD_DIR)/include $(1)/usr/include/madwifi/ + mkdir -p $(1)/usr/include/madwifi/net80211 + $(CP) $(PKG_BUILD_DIR)/net80211/*.h $(1)/usr/include/madwifi/net80211/ endef define Build/UninstallDev - rm -rf $(STAGING_DIR)/usr/include/madwifi + rm -rf $(1)/usr/include/madwifi endef define KernelPackage/madwifi/install @@ -146,4 +174,12 @@ define KernelPackage/madwifi/install $(CP) $(PKG_BUILD_DIR)/tools/{madwifi_multi,80211stats,athchans,athctrl,athkey,athstats,wlanconfig} $(1)/usr/sbin/ endef +define KernelPackage/madwifi-karma/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,80211stats,athchans,athctrl,athkey,athstats,wlanconfig} $(1)/usr/sbin/ +endef + $(eval $(call KernelPackage,madwifi)) +$(eval $(call KernelPackage,madwifi-karma))