ar71xx: don't use vlan 0 for devices with rtl8366s switch

[openwrt.git] / package / acx / Makefile

diff --git a/package/acx/Makefile b/package/acx/Makefile
index ce17302..9accc33 100644 (file)
--- a/package/acx/Makefile
+++ b/package/acx/Makefile
@@ -1,25 +1,20 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2010 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
-PKG_VERSION:=20071003
+PKG_VERSION:=20080210
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/acx100
-PKG_MD5SUM:=09cbaa558e1850d4996e7083d8b7bb93
-
-PKG_FW_NAME:=tiacx111c16
-PKG_FW_URL:=http://teknoraver.campuslife.it/software/acx-mac80211/
-PKG_FW_MD5SUM:=7026826460376f6b174f9225bd7781b9
+PKG_MD5SUM:=7d5ce3215708e4e9f95cf567a9ee3a12
 
 PKG_UNPACK:= \
        bzcat $(DL_DIR)/$(PKG_SOURCE) | \
@@ -28,10 +23,9 @@ PKG_UNPACK:= \
 
 include $(INCLUDE_DIR)/package.mk
 
-# XXX: remove @!TARGET_* later when we have PCI support properly detected on all targets
 define KernelPackage/acx
   TITLE:=Driver for TI ACX1xx chipset
-  DEPENDS:=@LINUX_2_6 +wireless-tools @!TARGET_atheros @!TARGET_avr32
+  DEPENDS:=@LINUX_2_6 @PCI_SUPPORT||TARGET_ar7 +wireless-tools
   URL:=http://acx100.sourceforge.net/
   SUBMENU:=Wireless Drivers
   FILES:= $(PKG_BUILD_DIR)/acx.$(LINUX_KMOD_SUFFIX)
@@ -42,10 +36,23 @@ define KernelPackage/acx/description
  This package contains a driver for TI ACX1xx 802.11a/b/g chipsets.
 endef
 
-$(STAMP_BUILT): $(DL_DIR)/$(PKG_FW_NAME)
+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))
 
-$(DL_DIR)/$(PKG_FW_NAME):
-       $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_FW_NAME)" "$(PKG_FW_MD5SUM)" $(PKG_FW_URL)
 
 define Build/Compile
        $(MAKE) -C $(LINUX_DIR) \
@@ -65,7 +72,10 @@ endef
 
 define KernelPackage/acx/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/
+       $(INSTALL_DIR) $(1)/lib/wifi
+       $(INSTALL_DATA) ./files/lib/wifi/acx.sh $(1)/lib/wifi/
 endef
 
 $(eval $(call KernelPackage,acx))