X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/cfe57b0b5f8537ac4e9b6d2e3c15c291d86e6063..fbe6073cf0a6bcc2a2e19fc25c3688c39fb99b79:/package/acx-mac80211/Makefile

diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile
index 8b09b43a4..59119b139 100644
--- a/package/acx-mac80211/Makefile
+++ b/package/acx-mac80211/Makefile
@@ -1,38 +1,31 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=acx-mac80211
-PKG_VERSION:=20071003
+PKG_REV:=a5f1bfc9
+PKG_VERSION:=20100815
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@SF/acx100
-PKG_MD5SUM:=dff7b396299001724e522d3ccf79c883
-
-PKG_FW_NAME:=tiacx111c16
-PKG_FW_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/
-PKG_FW_MD5SUM:=7026826460376f6b174f9225bd7781b9
+PKG_SOURCE_URL:=git://acx100.git.sourceforge.net/gitroot/acx100/acx-mac80211
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
 
 include $(INCLUDE_DIR)/package.mk
-ifeq ($(DUMP),)
-  include $(LINUX_DIR)/.config
-endif
 
-# XXX: remove @!TARGET_* later when we have PCI support properly detected on all targets
 define KernelPackage/acx-mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=ACX111 Mac80211 driver
-    DEPENDS:=@LINUX_2_6 +kmod-mac80211 @!TARGET_atheros
-#  KCONFIG:=CONFIG_MAC80211
-  FILES:=$(PKG_BUILD_DIR)/acx-mac80211.$(LINUX_KMOD_SUFFIX)
+  DEPENDS:=@PCI_SUPPORT||TARGET_ar7 +kmod-mac80211
+  FILES:=$(PKG_BUILD_DIR)/acx-mac80211.ko
   AUTOLOAD:=$(call AutoLoad,50,acx-mac80211)
 endef
 
@@ -40,42 +33,60 @@ define KernelPackage/acx-mac80211/description
 	Driver for acx111 cards (Mac80211 version)
 endef
 
-$(STAMP_BUILT): $(DL_DIR)/$(PKG_FW_NAME)
 
-$(DL_DIR)/$(PKG_FW_NAME):
-	$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW_NAME)" "$(PKG_FW_MD5SUM)" $(PKG_FW_URL)
+C16_FW:=tiacx111c16
+C19_FW:=tiacx111c19
+
+define Download/tiacx111c16
+  FILE:=$(C16_FW)
+  URL:=http://teknoraver.net/software/acx-mac80211/
+  MD5SUM:=7026826460376f6b174f9225bd7781b9
+endef
+$(eval $(call Download,tiacx111c16))
+
+define Download/tiacx111c19
+  FILE:=$(C19_FW)
+  URL:=http://ipkg.k1k2.de/files/
+  MD5SUM:=a1fa9681e297b4e36e257090fc12265a
+endef
+$(eval $(call Download,tiacx111c19))
+
 
-  PKG_EXTRA_KCONFIG:= \
+PKG_EXTRA_KCONFIG:= \
 	CONFIG_ACX_MAC80211=m \
 	CONFIG_ACX_MAC80211_PCI=m \
 
-  PKG_EXTRA_CFLAGS:= \
+PKG_EXTRA_CFLAGS:= \
 	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
 	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \
 
-  define Build/Compile/it
+ifneq ($(CONFIG_LINUX_2_6_25)$(CONFIG_LINUX_2_6_30)$(CONFIG_LINUX_2_6_31)$(CONFIG_LINUX_2_6_32),)
+  LINUX_AUTOCONF_FILE:= linux/autoconf.h
+else
+  LINUX_AUTOCONF_FILE:= generated/autoconf.h
+endif
+
+define Build/Compile
 	$(MAKE) -C "$(LINUX_DIR)" \
 		ARCH="$(LINUX_KARCH)" \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		SUBDIRS="$(PKG_BUILD_DIR)" \
 		$(PKG_EXTRA_KCONFIG) \
-		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS)" \
+		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(2,6,34)\"" \
 		LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211 -I$(LINUX_DIR)/include \
-			-include linux/autoconf.h" \
+			-Iarch/$(LINUX_KARCH)/include \
+			-include $(LINUX_AUTOCONF_FILE)" \
 		V="$(V)" \
 		modules
-  endef
-
-define Build/Configure
 endef
 
-define Build/Compile
-$(call Build/Compile/it)
+define Build/Configure
 endef
 
 define KernelPackage/acx-mac80211/install
 	$(INSTALL_DIR) $(1)/lib/firmware
-	$(INSTALL_DATA) $(DL_DIR)/$(PKG_FW_NAME) $(1)/lib/firmware/
+	$(INSTALL_DATA) $(DL_DIR)/$(C16_FW) $(1)/lib/firmware/
+	$(INSTALL_DATA) $(DL_DIR)/$(C19_FW) $(1)/lib/firmware/
 endef
 
 $(eval $(call KernelPackage,acx-mac80211))